NOAA-EMC · jkuang-exploro · Aug 31, 2020 · Feb 28, 2020 · Mar 4, 2020 · Mar 5, 2020
diff --git a/Externals_coupled.cfg b/Externals_coupled.cfg
@@ -1,5 +1,5 @@
 [ufs-s2s-model]
-tag = s2s_prototype4.0
+tag = ufss2s_cmeps_v0.7 
 local_path = sorc/fv3_coupled.fd
 repo_url = https://github.com/ufs-community/ufs-s2s-model
 protocol = git

diff --git a/README.md b/README.md
@@ -65,7 +65,7 @@ or
 For Orion: 
 First make sure you have python loaded: 
 module load contrib
-module load rocoto
+module load rocoto #Make sure to use 1.3.2 
 module load intelpython3
 and then replace ORION with HERA in the commands above. 
 

diff --git a/jobs/JWAVE_POST_SBS b/jobs/JWAVE_POST_SBS
@@ -56,7 +56,10 @@ export COMOUT=${COMOUT:-${COMOUTwave}/${COMPONENTwave}.${PDY}/${cyc}}
 
 mkdir -p $COMOUT/gridded
 mkdir -p $COMOUT/station
-mkdir -p $COMOUT/stats
+
+# Set mpi serial command
+export wavempexec=${launcher:-"mpirun -n"}
+export wave_mpmd=${mpmd:-"cfp"}
 
 env | sort
 

diff --git a/modulefiles/modulefile.reg2grb2.orion b/modulefiles/modulefile.reg2grb2.orion
@@ -2,13 +2,11 @@
 # reg2grb2 - orion
 #############################################################
 export FCOMP=ifort
-module load intel/2020
+module load intel/2018.4
 module load netcdf/4.7.2
 module load ip/3.0.2
 module load sp/2.0.3
 module load w3nco/2.0.7
 module load bacio/2.0.3
 module load landsfcutil/2.2.0
-module use -a /apps/contrib/NCEPLIBS/orion/modulefiles
 module load wgrib/2.0.8
-export WGRIB2_ROOT=/apps/contrib/NCEPLIBS/orion/NCEPLIBS/NCEPLIBS-external/build5/wgrib2/grib2
diff --git a/parm/mom6/MOM_input_025 b/parm/mom6/MOM_input_025
@@ -187,6 +187,7 @@ DTFREEZE_DP = -7.75E-08         !   [deg C Pa-1] default = 0.0
                                 ! temperature with pressure.
 
 ! === module MOM_restart ===
+RESTART_CHECKSUMS_REQUIRED = False
 PARALLEL_RESTARTFILES = True    !   [Boolean] default = False
                                 ! If true, each processor writes its own restart file,
                                 ! otherwise a single restart file is generated

diff --git a/parm/mom6/MOM_input_025_wav b/parm/mom6/MOM_input_025_wav
@@ -187,6 +187,7 @@ DTFREEZE_DP = -7.75E-08         !   [deg C Pa-1] default = 0.0
                                 ! temperature with pressure.
 
 ! === module MOM_restart ===
+RESTART_CHECKSUMS_REQUIRED = False
 PARALLEL_RESTARTFILES = True    !   [Boolean] default = False
                                 ! If true, each processor writes its own restart file,
                                 ! otherwise a single restart file is generated

diff --git a/sorc/build_fv3_coupled.sh b/sorc/build_fv3_coupled.sh
@@ -16,7 +16,12 @@ if [ ! -d "../exec" ]; then
   mkdir ../exec
 fi
 
+if [ $target = hera ]; then target=hera.intel ; fi
+if [ $target = orion ]; then target=orion.intel ; fi
+
+cd fv3_coupled.fd/
+FV3=$( pwd -P )/FV3
+cd tests/
+./compile.sh "$FV3" "$target" "CCPP=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled MOM6=Y CICE=Y WW3=Y CMEPS=Y" 1
+mv -f fcst_1.exe ../NEMS/exe/nems_fv3_ccpp_mom6_cice5_ww3.x
 
-cd fv3_coupled.fd/NEMS 
-make -j 8 app=coupledFV3_CCPP_MOM6_CICE_WW3 build
-mv ./exe/NEMS.x ./exe/nems_fv3_ccpp_mom6_cice5_ww3.x
diff --git a/sorc/machine-setup.sh b/sorc/machine-setup.sh
@@ -24,14 +24,14 @@ if [[ -d /work ]] ; then
     # We are on MSU Orion
     if ( ! eval module help > /dev/null 2>&1 ) ; then
         echo load the module command 1>&2
-        source /apps/lmod/init/$__ms_shell
+        source /apps/lmod/lmod/init/$__ms_shell
     fi
     target=orion
     module purge
     module load intel/2018.4
     module load impi/2018.4
     export NCEPLIBS=/apps/contrib/NCEPLIBS/orion
-    export WRFPATH=$NCEPLIBS/wrf.shared.new/v1.1.1/src
+    #export WRFPATH=$NCEPLIBS/wrf.shared.new/v1.1.1/src
     module use $NCEPLIBS/modulefiles
     export myFC=mpiifort
     export FCOMP=mpiifort

diff --git a/sorc/reg2grb2.fd/regdiag.f b/sorc/reg2grb2.fd/regdiag.f
@@ -377,7 +377,7 @@ subroutine diag(im,jm,km,icefile,ocnfile,                  &
 !           check why fac=-8.64e6 for evap minus precip 
 !-------------------------------------------------------------------
       data fac/    0.0, 0.001,1.0,1.0,    1.0,    1.0,    1.0,1.0,1.0,1.0, &
-                   1.0,273.15,1.0,1.0,-8.64e6,    1.0,    1.0,1.0,1.0,1.0, &
+                   1.0,273.15,1.0,1.0,-8.64e3,    1.0,    1.0,1.0,1.0,1.0, &
                    1.0,   1.0,1.0,1.0,    1.0,    1.0,    1.0,1.0,1.0,1.0, &
                    1.0,   1.0,1.0,1.0,    1.0,    1.0,    1.0/
 
@@ -784,10 +784,11 @@ subroutine diag(im,jm,km,icefile,ocnfile,                  &
       endif
 ! pme
       if (nv.eq.15) then
-       varsfc=pme
+       varsfc=lprec-evap !pme
        do j=1,jm
        do i=1,im
-          if (varsfc(i,j) .LE. spv_pme) varsfc(i,j)=undef
+!          if (varsfc(i,j) .LE. spv_pme) varsfc(i,j)=undef
+          if (lprec(i,j) .LE. spv_pme) varsfc(i,j)=undef
        enddo
        enddo
       endif

diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh
@@ -598,7 +598,8 @@ MOM6_postdet()
 
         # Copy mediator restart files to RUNDIR
         if [ $inistep = 'restart' ]; then
-           $NCP $ROTDIR/$CDUMP.$PDY/$cyc/mediator_* $DATA/
+           $NCP $ROTDIR/$CDUMP.$PDY/$cyc/ufs.s2s*.nc $DATA/
+           $NCP $ROTDIR/$CDUMP.$PDY/$cyc/rpointer.cpl $DATA/
         fi
 
 	echo "SUB ${FUNCNAME[0]}: MOM6 input data linked/copied"
@@ -629,7 +630,8 @@ MOM6_out()
 	[[ ! -d $COMOUT ]] && mkdir -m 775 -p $COMOUT
 
         if [ $inistep = 'cold' ]; then
-               cp $DATA/mediator_* $COMOUT/
+               cp $DATA/ufs.s2s.cold.cpl.r.*.nc $COMOUT/
+               cp $DATA/rpointer.cpl $COMOUT/
                status=$?
                exit $status
         else

diff --git a/ush/nems.configure.med_atm_ocn_ice.IN b/ush/nems.configure.med_atm_ocn_ice.IN
@@ -11,12 +11,6 @@ EARTH_attributes::
 # MED #
 MED_model:                      @[med_model]
 MED_petlist_bounds:             @[med_petlist_bounds]
-MED_attributes::
-  Verbosity = 0
-  DumpFields = @[DumpFields]
-  DumpRHs = false
-  coldstart = @[coldstart]
-  restart_interval = 0
 ::
 
 # ATM #
@@ -25,6 +19,8 @@ ATM_petlist_bounds:             @[atm_petlist_bounds]
 ATM_attributes::
   Verbosity = 0
   DumpFields = @[DumpFields]
+  ProfileMemory = false
+  OverwriteSlice = true
 ::
 
 # OCN #
@@ -33,7 +29,9 @@ OCN_petlist_bounds:             @[ocn_petlist_bounds]
 OCN_attributes::
   Verbosity = 0
   DumpFields = @[DumpFields]
-  restart_interval = 0
+  ProfileMemory = false
+  OverwriteSlice = true
+  dbug_flag = 0 
 ::
 
 # ICE #
@@ -42,27 +40,59 @@ ICE_petlist_bounds:             @[ice_petlist_bounds]
 ICE_attributes::
   Verbosity = 0
   DumpFields = @[DumpFields]
+  ProfileMemory = false
+  OverwriteSlice = true
+  dbug_flag = 0 
 ::
 
-# Run Sequence #
+# CMEPS warm run sequence
 runSeq::
-  @@[CPL_SLOW]
-    MED MedPhase_prep_ocn
-    MED -> OCN :remapMethod=redist
-    OCN
-    @@[CPL_FAST]
-      MED MedPhase_prep_ice
-      MED MedPhase_prep_atm
-      MED -> ATM :remapMethod=redist
-      MED -> ICE :remapMethod=redist
-      ATM
-      ICE
-      ATM -> MED :remapMethod=redist
-      ICE -> MED :remapMethod=redist
-      MED MedPhase_atm_ocn_flux
-      MED MedPhase_accum_fast
-    @
-    OCN -> MED :remapMethod=redist
-    MED MedPhase_write_restart
-  @
+@@[CPL_SLOW]
+   MED med_phases_prep_ocn_accum_avg
+   MED -> OCN :remapMethod=redist
+   OCN
+   @@[CPL_FAST]
+     MED med_phases_prep_atm
+     MED med_phases_prep_ice
+     MED -> ATM :remapMethod=redist
+     MED -> ICE :remapMethod=redist
+     ATM
+     ICE
+     ATM -> MED :remapMethod=redist
+     ICE -> MED :remapMethod=redist
+     MED med_fraction_set
+     MED med_phases_prep_ocn_map
+     MED med_phases_prep_ocn_merge
+     MED med_phases_prep_ocn_accum_fast
+     MED med_phases_profile
+   @
+   OCN -> MED :remapMethod=redist
+   MED med_phases_restart_write
+@
+::
+
+# CMEPS variables
+
+DRIVER_attributes::
+      mediator_read_restart = .true.
+::
+MED_attributes::
+      ATM_model = @[atm_model]
+      ICE_model = @[ice_model]
+      OCN_model = @[ocn_model]
+      history_n = 0
+      history_option = nhours
+      history_ymd = -999
+      coupling_mode = nems_orig
+::
+ALLCOMP_attributes::
+      ScalarFieldCount = 2
+      ScalarFieldIdxGridNX = 1
+      ScalarFieldIdxGridNY = 2
+      ScalarFieldName = cpl_scalars
+      start_type = startup
+      case_name = ufs.s2s
+      restart_n = @[restart_interval_hours]
+      restart_option = nhours
+      restart_ymd = -999
 ::
diff --git a/ush/nems.configure.med_atm_ocn_ice_wav.IN b/ush/nems.configure.med_atm_ocn_ice_wav.IN
@@ -11,13 +11,6 @@ EARTH_attributes::
 # MED #
 MED_model:                      @[med_model]
 MED_petlist_bounds:             @[med_petlist_bounds]
-MED_attributes::
-  Verbosity = 0
-  DumpFields = @[DumpFields]
-  DumpRHs = false
-  coldstart = false
-  restart_interval = 0
-  ProfileMemory = false
 ::
 
 # ATM #
@@ -27,7 +20,7 @@ ATM_attributes::
   Verbosity = 0
   DumpFields = @[DumpFields]
   ProfileMemory = false
-  OverwriteSlice = false
+  OverwriteSlice = true
 ::
 
 # OCN #
@@ -36,9 +29,9 @@ OCN_petlist_bounds:             @[ocn_petlist_bounds]
 OCN_attributes::
   Verbosity = 0
   DumpFields = @[DumpFields]
-  restart_interval = 0
   ProfileMemory = false
-  OverwriteSlice = false
+  OverwriteSlice = true
+  dbug_flag = 0
 ::
 
 # ICE #
@@ -48,42 +41,72 @@ ICE_attributes::
   Verbosity = 0
   DumpFields = @[DumpFields]
   ProfileMemory = false
-  OverwriteSlice = false
+  OverwriteSlice = true
+  dbug_flag = 0 
 ::
 
-# WAV # 
+# WAV #
 WAV_model:                      @[wav_model]
 WAV_petlist_bounds:             @[wav_petlist_bounds]
 WAV_attributes::
   Verbosity = 0
   OverwriteSlice = false
 ::
 
-# Run Sequence #
+# CMEPS warm run sequence
 runSeq::
-  @@[CPL_SLOW]
-    MED MedPhase_prep_ocn
-    MED -> OCN :remapMethod=redist
-    OCN -> WAV 
-    WAV -> OCN :srcMaskValues=1
-    OCN
-    @@[CPL_FAST]
-      MED MedPhase_prep_ice
-      MED MedPhase_prep_atm
-      MED -> ATM :remapMethod=redist
-      MED -> ICE :remapMethod=redist
-      WAV -> ATM :srcMaskValues=1
-      ATM -> WAV
-      ICE -> WAV
-      ATM
-      ICE
-      WAV 
-      ATM -> MED :remapMethod=redist
-      ICE -> MED :remapMethod=redist
-      MED MedPhase_atm_ocn_flux
-      MED MedPhase_accum_fast
-    @
-    OCN -> MED :remapMethod=redist
-    MED MedPhase_write_restart
-  @
+@@[CPL_SLOW]
+   MED med_phases_prep_ocn_accum_avg
+   MED -> OCN :remapMethod=redist
+   OCN -> WAV
+   WAV -> OCN :srcMaskValues=1
+   OCN
+   @@[CPL_FAST]
+     MED med_phases_prep_atm
+     MED med_phases_prep_ice
+     MED -> ATM :remapMethod=redist
+     MED -> ICE :remapMethod=redist
+     WAV -> ATM :srcMaskValues=1
+     ATM -> WAV
+     ICE -> WAV
+     ATM
+     ICE
+     WAV
+     ATM -> MED :remapMethod=redist
+     ICE -> MED :remapMethod=redist
+     MED med_fraction_set
+     MED med_phases_prep_ocn_map
+     MED med_phases_prep_ocn_merge
+     MED med_phases_prep_ocn_accum_fast
+     MED med_phases_profile
+   @
+   OCN -> MED :remapMethod=redist
+   MED med_phases_restart_write
+@
+::
+
+# CMEPS variables
+
+DRIVER_attributes::
+      mediator_read_restart = .true.
+::
+MED_attributes::
+      ATM_model = @[atm_model]
+      ICE_model = @[ice_model]
+      OCN_model = @[ocn_model]
+      history_n = 0
+      history_option = nhours
+      history_ymd = -999
+      coupling_mode = nems_orig
+::
+ALLCOMP_attributes::
+      ScalarFieldCount = 2
+      ScalarFieldIdxGridNX = 1
+      ScalarFieldIdxGridNY = 2
+      ScalarFieldName = cpl_scalars
+      start_type = startup
+      case_name = ufs.s2s
+      restart_n = @[restart_interval_hours]
+      restart_option = nhours
+      restart_ymd = -999
 ::