update cmeps, fix debug compile, rename nems.configure files for coup…

…led model (NOAA-EMC#254) * Implements a bugfix for the mapping of ifrac for both nems_orig and nems_frac in CMEPS: issue (NOAA-EMC#17)[NOAA-EMC/CMEPS#17] * Adds field-packing for performance improvements in CMEPS: issue (NOAA-EMC#23)[NOAA-EMC/CMEPS#23] * Uses module file fv3_debug when DEBUG=Y is specified and fv3_debug is available * Shortens the nems.configure file name used with the coupled model
zhanglikate · Nov 9, 2020 · 4e8ef6a · 4e8ef6a
1 parent 9429797
commit 4e8ef6a
Show file tree

Hide file tree

Showing 17 changed files with 562 additions and 557 deletions.
diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
diff --git a/CMEPS-interface/CMakeLists.txt b/CMEPS-interface/CMakeLists.txt
@@ -55,7 +55,8 @@ list(APPEND _mediator_files
   CMEPS/mediator/med_utils_mod.F90
   CMEPS/mediator/med_fraction_mod.F90
   CMEPS/mediator/med_phases_aofluxes_mod.F90
-  CMEPS/mediator/med_io_mod.F90)
+  CMEPS/mediator/med_io_mod.F90
+  CMEPS/mediator/med_diag_mod.F90)
 
 list(APPEND _mediator_defs ESMF_VERSION_MAJOR=${ESMF_VERSION_MAJOR}
                            ESMF_VERSION_MINOR=${ESMF_VERSION_MINOR}

diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/compile.sh b/tests/compile.sh
@@ -57,7 +57,11 @@ if [[ $MACHINE_ID == macosx.* ]] || [[ $MACHINE_ID == linux.* ]]; then
   source $PATHTR/modulefiles/${MACHINE_ID}/fv3
 else
   module use $PATHTR/modulefiles/${MACHINE_ID}
-  module load fv3
+  modulefile="fv3"
+  if [[ "${MAKE_OPT}" == *"DEBUG=Y"* ]]; then
+    [[ -f $PATHTR/modulefiles/${MACHINE_ID}/fv3_debug ]] && modulefile="fv3_debug"
+  fi
+  module load $modulefile
   module list
 fi
 set -x

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -375,7 +375,7 @@ export CPL_SLOW=${DT_THERM_MOM6}
 export CPL_FAST=${DT_ATMOS}
 
 # nems.configure defaults
-export NEMS_CONFIGURE="nems.configure.medcmeps_atm_ocn_ice.IN"
+export NEMS_CONFIGURE="nems.configure.cpld.IN"
 export med_model="nems"
 export atm_model="fv3"
 export ocn_model="mom6"
@@ -428,9 +428,9 @@ export MOM6_RESTART_SETTING='n'
 export MOM6_RIVER_RUNOFF='False'
 export FRUNOFF=""
 export CHLCLIM="seawifs_1998-2006_smoothed_2X.nc"
-# this must be set False for restart repro 
+# this must be set False for restart repro
 export MOM6_REPRO_LA='False'
-# since CPL_SLOW is set to DT_THERM, this should be always be false 
+# since CPL_SLOW is set to DT_THERM, this should be always be false
 export MOM6_THERMO_SPAN='False'
 # no WW3
 export MOM6_USE_WAVES='False'

diff --git a/tests/edit_inputs.sh b/tests/edit_inputs.sh
@@ -41,11 +41,11 @@ function edit_mom_input {
       -e "s/MOM6_USE_WAVES/$MOM6_USE_WAVES/g" \
       -e "s/NX_GLB/$NX_GLB/g" \
       -e "s/NY_GLB/$NY_GLB/g" \
-      -e "s/CHLCLIM/$CHLCLIM/g" 
+      -e "s/CHLCLIM/$CHLCLIM/g"
 }
 
 function edit_data_table {
-  sed -e "s/FRUNOFF/$FRUNOFF/g" 
+  sed -e "s/FRUNOFF/$FRUNOFF/g"
 }
 
 function edit_diag_table {

diff --git a/tests/fv3_conf/cpld_bmark_run.IN b/tests/fv3_conf/cpld_bmark_run.IN
@@ -1,4 +1,4 @@
-mkdir INPUT RESTART history MOM6_OUTPUT 
+mkdir INPUT RESTART history MOM6_OUTPUT
 
 if [[ $ATMRES == 'C96' ]]; then
   FV3_DIR=FV3_input_data
@@ -58,4 +58,3 @@ cp    @[RTPWD]/${FV3_IC}/gfs_data*.nc ./INPUT
 cp    @[RTPWD]/${MOM6_IC}/MOM*.nc ./INPUT
 # the BM ICs are still named cice5 and need to remain so until P5.0 is completed
 cp    @[RTPWD]/${CICE_IC}/cice5_model_@[ICERES].*.nc ./cice_model.res.nc
-
diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
@@ -1,4 +1,4 @@
-mkdir INPUT RESTART history MOM6_OUTPUT 
+mkdir INPUT RESTART history MOM6_OUTPUT
 
 if [[ $ATMRES == 'C96' ]]; then
   FV3_DIR=FV3_input_data

diff --git a/...rm/nems.configure.medcmeps_atm_ocn_ice.IN → tests/parm/nems.configure.cpld.IN b/...rm/nems.configure.medcmeps_atm_ocn_ice.IN → tests/parm/nems.configure.cpld.IN
diff --git a/...ems.configure.medcmeps_atm_ocn_ice_wav.IN → tests/parm/nems.configure.cpld_wave.IN b/...ems.configure.medcmeps_atm_ocn_ice_wav.IN → tests/parm/nems.configure.cpld_wave.IN
diff --git a/tests/rt.sh b/tests/rt.sh
@@ -400,9 +400,9 @@ if [[ $SINGLE_NAME != '' ]]; then
 fi
 
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = jet.* ]]; then
-  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20201103/${RT_COMPILER^^}}
+  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20201106/${RT_COMPILER^^}}
 else
-  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20201103}
+  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20201106}
 fi
 
 shift $((OPTIND-1))

diff --git a/tests/tests/cpld_bmark b/tests/tests/cpld_bmark
@@ -53,7 +53,7 @@ export LIST_FILES="phyf024.tile1.nc \
                    RESTART/MOM.res_1.nc \
                    RESTART/MOM.res_2.nc \
                    RESTART/MOM.res_3.nc \
-                   RESTART/iced.2013-04-02-00000.nc" 
+                   RESTART/iced.2013-04-02-00000.nc"
                    #RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc"
 
 export_fv3

diff --git a/tests/tests/cpld_bmark_wave b/tests/tests/cpld_bmark_wave
@@ -104,7 +104,7 @@ export CPL_SLOW=${DT_THERM_MOM6}
 export CPL_FAST=${DT_ATMOS}
 
 # nems.configure
-export NEMS_CONFIGURE="nems.configure.medcmeps_atm_ocn_ice_wav.IN"
+export NEMS_CONFIGURE="nems.configure.cpld_wave.IN"
 export coupling_interval_slow_sec=${CPL_SLOW}
 export coupling_interval_fast_sec=${CPL_FAST}
 

diff --git a/tests/tests/cpld_bmark_wave_35d b/tests/tests/cpld_bmark_wave_35d
@@ -65,7 +65,7 @@ export CPL_SLOW=${DT_THERM_MOM6}
 export CPL_FAST=${DT_ATMOS}
 
 # nems.configure
-export NEMS_CONFIGURE="nems.configure.medcmeps_atm_ocn_ice_wav.IN"
+export NEMS_CONFIGURE="nems.configure.cpld_wave.IN"
 export coupling_interval_slow_sec=${CPL_SLOW}
 export coupling_interval_fast_sec=${CPL_FAST}