Merge pull request #321 from GEOS-ESM/feature/rtodling/bkgecov_fix_co…

…mpiler_opts

Fix compilation options

src/Applications/NCEP_Etc/NCEP_bkgecov/CMakeLists.txt

@@ -11,13 +11,8 @@ set (SRCS
   vertlength.F90 addoz.f90 m_nc_berror.f90
   )
 
-# This is equivalent to FOPT=$(FOPT3) in GNU Make
 if (CMAKE_Fortran_COMPILER_ID MATCHES Intel)
-   string (REPLACE "${FPE0}" "${BIG_ENDIAN} ${BYTERECLEN} ${FPE0}" CMAKE_Fortran_FLAGS_RELEASE ${CMAKE_Fortran_FLAGS_RELEASE})
-   string (REPLACE "${OPTREPORT0}" "" CMAKE_Fortran_FLAGS_RELEASE ${CMAKE_Fortran_FLAGS_RELEASE})
-   string (REPLACE "${FTZ}" "" CMAKE_Fortran_FLAGS_RELEASE ${CMAKE_Fortran_FLAGS_RELEASE})
-   string (REPLACE "${ALIGN_ALL}" "" CMAKE_Fortran_FLAGS_RELEASE ${CMAKE_Fortran_FLAGS_RELEASE})
-   string (REPLACE "${NO_ALIAS}" "" CMAKE_Fortran_FLAGS_RELEASE ${CMAKE_Fortran_FLAGS_RELEASE})
+   set (CMAKE_Fortran_FLAGS_RELEASE "${FOPT2} ${TRACEBACK} ${BIG_ENDIAN} ${BYTERECLEN} ${FPE0} ${ALIGNCOM}")
 endif ()
 
 esma_add_library (${this}

src/Applications/NCEP_Etc/NCEP_bkgecov/ut_gen_berrcov.j

@@ -1,6 +1,6 @@
 #!/bin/csh  -x
 #SBATCH --account=g0613
-#SBATCH --constraint=sky
+#SBATCH --constraint=mil
 #_SBATCH --ntasks=8
 #_SBATCH --ntasks=36
 #_SBATCH --ntasks=96
@@ -33,11 +33,16 @@
  setenv EXPID f525_fp
  setenv EXPID f525_p7_fp
  setenv EXPID f5271_fp
+ setenv EXPID x0049
+ setenv EXPID x0046d
+ setenv EXPID CYCLED_REPLAY_P10800_C21600_T21600
+ setenv EXPID e572p5_fp
+ setenv EXPID e5131_fp
 #setenv FVHOME /home/dao_ops/$EXPID
 #setenv ARCROOT /home/dao_ops/$EXPID/run/.../archive/prog
 #setenv FVHOME /discover/nobackup/projects/gmao/obsdev/rtodling/$EXPID
 #setenv FVHOME /discover/nobackup/projects/gmao/obsdev/rtodling/x0041
-setenv FVHOME /discover/nobackup/projects/gmao/dadev/rtodling/prePP
+setenv FVHOME /discover/nobackup/projects/gmao/dadev/rtodling/SLES15/prePP
 setenv FVROOT `cat $FVHOME/.FVROOT`
 setenv PLAINDIR 0
 setenv ARCROOT /archive/u/$user/$EXPID/prog
@@ -60,8 +65,8 @@ setenv GEN_NMCDIFFS 0
 setenv GET_BERROR    1
 setenv BERROR_NMODES 25
 
-set these_lats = ( 25 46 91 181 361 721 )
-#set these_lats = ( 721 )
+#set these_lats = ( 25 46 91 181 361 721 )
+set these_lats = ( 361 )
 
 # Basic settings (weak dependency on version of DAS)
 # --------------------------------------------------
@@ -73,7 +78,8 @@ setenv ATMENS_BATCHSUB sbatch
 setenv GID g0613
 setenv FCSTACQ_WALLCLOCK 2:00:00
 setenv FCSTWORK /discover/nobackup/projects/gmao/obsdev/$user/fcst4berrcov.$EXPID
-setenv FCSTWORK /discover/nobackup/projects/gmao/dadev/$user/fcst4berrcov.$EXPID
+setenv FCSTWORK /discover/nobackup/projects/gmao/dadev/$user/Berror/fcst4berrcov.$EXPID
+setenv FCSTWORK /discover/nobackup/projects/gmao/dadev/$user/Berror/fcst4berrcov.$EXPID
 
 if ($?I_MPI_ROOT ) then
   setenv MPIRUN_CALCSTATS "mpirun -np 864 calcstats.x"
@@ -102,8 +108,9 @@ set vnymd0 = 20200804
 set vnhms0 = 000000
 @ nsamples = 58
 #setenv FCSTWRK $FCSTWORK.$vnymd0.$vnhms0
-setenv FCSTWRK $FCSTWORK.all
-mkdir $FCSTWRK
+#setenv FCSTWRK $FCSTWORK.all
+setenv FCSTWRK $FCSTWORK
+if ( ! -d $FCSTWRK ) mkdir $FCSTWRK
 set diren = `dirname $FCSTWRK`
 set spool = "-s $diren/spool "
 
@@ -366,6 +373,9 @@ if ( $GET_BERROR ) then
 
    # wire for now
    set NSIG   = $fcst_res[3]
+   if ($NSIG == 181) then
+      setenv BERROR_NMODES 30
+   endif
 
    # Prepare resource files
    set this_param = $FVROOT/etc/berror_stats.nml.tmpl

src/Applications/NCEP_Etc/NCEP_bkgecov/variables.f90

@@ -192,6 +192,12 @@ subroutine init_smooth_vars(nsig)
         hcoeffs(104:118)=10.0  !upto about   1 mb
         hcoeffs(119:132)=360.0 !upto the top
     endif
+    if (nsig==181) then
+        hcoeffs(  1:100)=10.0  !upto about 100 mb
+        hcoeffs(101:142)=100   !upto about  10 mb
+        hcoeffs(143:162)=10.0  !upto about   1 mb
+        hcoeffs(163:181)=360.0 !upto the top
+    endif
 
     vcoeffs=0.0
     if ( nsig==72 ) then