Update CICE (#1842)

* reverting the bug fix for ktherm=2 allows all cpld tests to pass and the single datm test using ktherm=2 (datm_cdeps_gfs) to also pass all other datm tests which use ktherm=1 fail * update CICE * change freq in for ice_diag.d global values * remove unused history* settings * update DISKNM with epic and rt log * Update bl.py for new Hera blstore
ufs-community · Aug 2, 2023 · 641887b · 641887b
1 parent 2d09adf
commit 641887b
Show file tree

Hide file tree

Showing 32 changed files with 3,496 additions and 3,454 deletions.
diff --git a/CICE-interface/CICE b/CICE-interface/CICE
diff --git a/tests/auto-jenkins/jobs/bl.py b/tests/auto-jenkins/jobs/bl.py
@@ -20,7 +20,7 @@ def set_directories(job_obj):
     logger = logging.getLogger('BL/SET_DIRECTORIES')
     if job_obj.machine == 'hera':
         workdir = '/scratch1/NCEPDEV/nems/emc.nemspara/autort/pr'
-        blstore = '/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs'
+        blstore = '/scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs'
         rtbldir = '/scratch1/NCEPDEV/stmp4/emc.nemspara/FV3_RT/'\
                  f'REGRESSION_TEST'
     elif job_obj.machine == 'jet':

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -884,6 +884,7 @@ export RUNID=unknown
 # set large; restart frequency now controlled by restart_n in nems.configure
 export DUMPFREQ=d
 export DUMPFREQ_N=1000
+export DIAG_FREQ=`expr $FHMAX \* 3600 / $DT_CICE`
 export USE_RESTART_TIME=.false.
 export RESTART_EXT=.false.
 # setting to true will allow Frazil FW and Salt to be
@@ -1034,6 +1035,7 @@ export RUNID=unknown
 # set large; restart frequency now controlled by restart_n in nems.configure
 export DUMPFREQ=d
 export DUMPFREQ_N=1000
+export DIAG_FREQ=`expr $FHMAX \* 3600 / $DT_CICE`
 export USE_RESTART_TIME=.false.
 export RESTART_EXT=.false.
 # setting to true will allow Frazil FW and Salt to be

diff --git a/tests/logs/RegressionTests_gaea.log b/tests/logs/RegressionTests_gaea.log
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/logs/RegressionTests_jet.log b/tests/logs/RegressionTests_jet.log
diff --git a/tests/logs/RegressionTests_orion.log b/tests/logs/RegressionTests_orion.log
diff --git a/tests/logs/RegressionTests_wcoss2.log b/tests/logs/RegressionTests_wcoss2.log
diff --git a/tests/parm/ice_in_template b/tests/parm/ice_in_template
@@ -25,7 +25,7 @@
     dumpfreq_n     = @[DUMPFREQ_N]
     dump_last      = .false.
     bfbflag        = 'off'
-    diagfreq       = 6
+    diagfreq       = @[DIAG_FREQ]
     diag_type      = 'file'
     diag_file      = 'ice_diag.d'
     print_global   = .true.

diff --git a/tests/parm/nems.configure.atmw.IN b/tests/parm/nems.configure.atmw.IN
@@ -68,9 +68,6 @@ DRIVER_attributes::
 MED_attributes::
       ATM_model = @[atm_model]
       WAV_model = @[wav_model]
-      history_n = 1
-      history_option = nhours
-      history_ymd = -999
       coupling_mode = @[CPLMODE]
       history_tile_atm = @[ATMTILESIZE]
       pio_rearranger = @[pio_rearranger]

diff --git a/tests/parm/nems.configure.cpld.IN b/tests/parm/nems.configure.cpld.IN
@@ -122,9 +122,6 @@ MED_attributes::
       ICE_model = @[ice_model]
       OCN_model = @[ocn_model]
       WAV_model = @[wav_model]
-      history_n = 1
-      history_option = nhours
-      history_ymd = -999
       coupling_mode = @[CPLMODE]
       history_tile_atm = @[ATMTILESIZE]
       pio_rearranger = @[pio_rearranger]

diff --git a/tests/parm/nems.configure.cpld_agrid.IN b/tests/parm/nems.configure.cpld_agrid.IN
@@ -79,7 +79,6 @@ runSeq::
    OCN -> MED :remapMethod=redist
    MED med_phases_post_ocn
    MED med_phases_restart_write
-   MED med_phases_history_write
 @
 ::
 
@@ -92,9 +91,6 @@ MED_attributes::
       ATM_model = @[atm_model]
       ICE_model = @[ice_model]
       OCN_model = @[ocn_model]
-      history_n = 1
-      history_option = nhours
-      history_ymd = -999
       coupling_mode = @[CPLMODE]
       history_tile_atm = @[ATMTILESIZE]
       aoflux_grid = 'agrid'

diff --git a/tests/parm/nems.configure.cpld_noaero.IN b/tests/parm/nems.configure.cpld_noaero.IN
@@ -111,9 +111,6 @@ MED_attributes::
       ICE_model = @[ice_model]
       OCN_model = @[ocn_model]
       WAV_model = @[wav_model]
-      history_n = 1
-      history_option = nhours
-      history_ymd = -999
       coupling_mode = @[CPLMODE]
       history_tile_atm = @[ATMTILESIZE]
       pio_rearranger = @[pio_rearranger]

diff --git a/tests/parm/nems.configure.cpld_noaero_nowave.IN b/tests/parm/nems.configure.cpld_noaero_nowave.IN
@@ -90,9 +90,6 @@ MED_attributes::
       ATM_model = @[atm_model]
       ICE_model = @[ice_model]
       OCN_model = @[ocn_model]
-      history_n = 1
-      history_option = nhours
-      history_ymd = -999
       coupling_mode = @[CPLMODE]
       history_tile_atm = @[ATMTILESIZE]
       pio_rearranger = @[pio_rearranger]

diff --git a/tests/parm/nems.configure.cpld_noaero_outwav.IN b/tests/parm/nems.configure.cpld_noaero_outwav.IN
@@ -105,9 +105,6 @@ MED_attributes::
       ICE_model = @[ice_model]
       OCN_model = @[ocn_model]
       WAV_model = @[wav_model]
-      history_n = 1
-      history_option = nhours
-      history_ymd = -999
       coupling_mode = @[CPLMODE]
       history_tile_atm = @[ATMTILESIZE]
       pio_rearranger = @[pio_rearranger]

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -304,7 +304,7 @@ elif [[ $MACHINE_ID = hera ]]; then
 
   PARTITION=
   dprefix=/scratch1/NCEPDEV
-  DISKNM=$dprefix/nems/emc.nemspara/RT
+  DISKNM=/scratch2/NAGAPE/epic/UFS-WM_RT
   STMP=$dprefix/stmp4
   PTMP=$dprefix/stmp2
 

diff --git a/tests/tests/cpld_bmark_p8 b/tests/tests/cpld_bmark_p8
@@ -115,6 +115,7 @@ export DT_INNER=${DT_ATMOS}
 export DT_CICE=${DT_ATMOS}
 export DT_DYNAM_MOM6=900
 export DT_THERM_MOM6=1800
+export DIAG_FREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
 
 # nems.configure
 export coupling_interval_slow_sec=${DT_THERM_MOM6}

diff --git a/tests/tests/cpld_control_c192_p8 b/tests/tests/cpld_control_c192_p8
@@ -107,6 +107,7 @@ export DT_INNER=${DT_ATMOS}
 export DT_CICE=${DT_ATMOS}
 export DT_DYNAM_MOM6=1800
 export DT_THERM_MOM6=3600
+export DIAG_FREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
 
 # nems.configure
 export coupling_interval_slow_sec=${DT_THERM_MOM6}

diff --git a/tests/tests/cpld_debug_noaero_p8 b/tests/tests/cpld_debug_noaero_p8
@@ -70,6 +70,7 @@ export DNATS=0
 export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
+export DIAG_FREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
 
 export DIAG_TABLE=diag_table_template
 export FIELD_TABLE=field_table_thompson_noaero_tke

diff --git a/tests/tests/cpld_debug_p8 b/tests/tests/cpld_debug_p8
@@ -69,6 +69,7 @@ export AOD_FRQ=030000
 export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
+export DIAG_FREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
 
 export FV3_RUN=cpld_control_run.IN
 

diff --git a/tests/tests/cpld_debug_pdlib_p8 b/tests/tests/cpld_debug_pdlib_p8
@@ -83,6 +83,7 @@ export DNATS=0
 export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
+export DIAG_FREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
 
 export WAVDOMAIN=global_270k
 export MESH_WAV=mesh.${WAVDOMAIN}.nc

diff --git a/tests/tests/cpld_restart_bmark_p8 b/tests/tests/cpld_restart_bmark_p8
@@ -119,6 +119,7 @@ export DT_INNER=${DT_ATMOS}
 export DT_CICE=${DT_ATMOS}
 export DT_DYNAM_MOM6=900
 export DT_THERM_MOM6=1800
+export DIAG_FREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
 
 # nems.configure
 export coupling_interval_slow_sec=${DT_THERM_MOM6}

diff --git a/tests/tests/cpld_restart_c192_p8 b/tests/tests/cpld_restart_c192_p8
@@ -109,6 +109,7 @@ export DT_INNER=${DT_ATMOS}
 export DT_CICE=${DT_ATMOS}
 export DT_DYNAM_MOM6=1800
 export DT_THERM_MOM6=3600
+export DIAG_FREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
 
 # nems.configure
 export coupling_interval_slow_sec=${DT_THERM_MOM6}

diff --git a/tests/tests/cpld_restart_c48 b/tests/tests/cpld_restart_c48
@@ -107,6 +107,7 @@ export DT_ATMOS=1200
 export DT_CICE=${DT_ATMOS}
 export DT_DYNAM_MOM6=3600
 export DT_THERM_MOM6=3600
+export DIAG_FREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
 
 # nems.configure
 export coupling_interval_slow_sec=${DT_THERM_MOM6}

diff --git a/tests/tests/cpld_restart_p8 b/tests/tests/cpld_restart_p8
@@ -85,6 +85,7 @@ export MOM6_RESTART_SETTING=r
 export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
+export DIAG_FREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
 
 export FV3_RUN=cpld_control_run.IN
 

diff --git a/tests/tests/cpld_restart_pdlib_p8 b/tests/tests/cpld_restart_pdlib_p8
@@ -97,6 +97,7 @@ export DNATS=0
 export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
+export DIAG_FREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
 
 export WAVDOMAIN=global_270k
 export MESH_WAV=mesh.${WAVDOMAIN}.nc

diff --git a/tests/tests/cpld_restart_qr_p8 b/tests/tests/cpld_restart_qr_p8
@@ -86,6 +86,7 @@ export MOM6_RESTART_SETTING=r
 export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
+export DIAG_FREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
 
 export FV3_RUN=cpld_control_run.IN
 

diff --git a/tests/tests/cpld_warmstart_c48 b/tests/tests/cpld_warmstart_c48
@@ -104,6 +104,7 @@ export DT_ATMOS=1200
 export DT_CICE=${DT_ATMOS}
 export DT_DYNAM_MOM6=3600
 export DT_THERM_MOM6=3600
+export DIAG_FREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
 
 # nems.configure
 export coupling_interval_slow_sec=${DT_THERM_MOM6}

diff --git a/tests/tests/datm_cdeps_debug_cfsr b/tests/tests/datm_cdeps_debug_cfsr
@@ -19,6 +19,7 @@ export DAYS="0.25"
 export FHMAX=6
 export RESTART_N=${FHMAX}
 export eps_imesh='2.5e-1'
+export DIAG_FREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
 export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
 export FV3_RUN=cpld_datm_cdeps.IN
diff --git a/tests/tests/datm_cdeps_mx025_cfsr b/tests/tests/datm_cdeps_mx025_cfsr
@@ -37,6 +37,7 @@ export NPROC_ICE='48'
 export np2=`expr $NPROC_ICE / 2`
 export BLCKX=`expr $NX_GLB / $np2`
 export BLCKY=`expr $NY_GLB / 2`
+export DIAG_FREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
 
 # resolution dependent files
 export MOM_INPUT="MOM_input_template_${OCNRES}"

diff --git a/tests/tests/datm_cdeps_mx025_gefs b/tests/tests/datm_cdeps_mx025_gefs
@@ -46,6 +46,7 @@ export NPROC_ICE='48'
 export np2=`expr $NPROC_ICE / 2`
 export BLCKX=`expr $NX_GLB / $np2`
 export BLCKY=`expr $NY_GLB / 2`
+export DIAG_FREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
 
 # resolution dependent files
 export MOM_INPUT="MOM_input_template_${OCNRES}"

diff --git a/tests/tests/datm_cdeps_restart_cfsr b/tests/tests/datm_cdeps_restart_cfsr
@@ -27,4 +27,5 @@ export MOM6_RESTART_SETTING="r"
 export eps_imesh='2.5e-1'
 export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
+export DIAG_FREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
 export FV3_RUN=cpld_datm_cdeps.IN
+29 −0		.readthedocs.yaml
+2 −160		cicecore/cicedyn/analysis/ice_diagnostics.F90
+2 −2		cicecore/cicedyn/analysis/ice_history.F90
+3 −3		cicecore/cicedyn/analysis/ice_history_pond.F90
+5 −3		cicecore/cicedyn/analysis/ice_history_shared.F90
+1 −1		cicecore/cicedyn/analysis/ice_history_snow.F90
+21 −20		cicecore/cicedyn/dynamics/ice_dyn_vp.F90
+4 −8		cicecore/cicedyn/dynamics/ice_transport_driver.F90
+52 −61		cicecore/cicedyn/dynamics/ice_transport_remap.F90
+137 −402		cicecore/cicedyn/general/ice_forcing.F90
+47 −30		cicecore/cicedyn/general/ice_init.F90
+32 −28		cicecore/cicedyn/infrastructure/comm/mpi/ice_exit.F90
+156 −76		cicecore/cicedyn/infrastructure/comm/mpi/ice_global_reductions.F90
+17 −17		cicecore/cicedyn/infrastructure/comm/mpi/ice_reprosum.F90
+1 −1		cicecore/cicedyn/infrastructure/comm/serial/ice_boundary.F90
+47 −22		cicecore/cicedyn/infrastructure/comm/serial/ice_exit.F90
+156 −76		cicecore/cicedyn/infrastructure/comm/serial/ice_global_reductions.F90
+2 −2		cicecore/cicedyn/infrastructure/ice_domain.F90
+9 −9		cicecore/cicedyn/infrastructure/io/io_binary/ice_history_write.F90
+43 −14		cicecore/cicedyn/infrastructure/io/io_netcdf/ice_history_write.F90
+34 −13		cicecore/cicedyn/infrastructure/io/io_pio2/ice_history_write.F90
+10 −10		cicecore/drivers/nuopc/cmeps/ice_mesh_mod.F90
+122 −38		cicecore/drivers/unittest/optargs/optargs.F90
+76 −40		cicecore/drivers/unittest/optargs/optargs_subs.F90
+59 −0		cicecore/drivers/unittest/opticep/CICE.F90
+71 −0		cicecore/drivers/unittest/opticep/CICE_FinalMod.F90
+517 −0		cicecore/drivers/unittest/opticep/CICE_InitMod.F90
+741 −0		cicecore/drivers/unittest/opticep/CICE_RunMod.F90
+30 −0		cicecore/drivers/unittest/opticep/README
+3,135 −0		cicecore/drivers/unittest/opticep/ice_init_column.F90
+1,784 −0		cicecore/drivers/unittest/opticep/ice_step_mod.F90
+34 −25		cicecore/drivers/unittest/sumchk/sumchk.F90
+11 −11		cicecore/shared/ice_fileunits.F90
+4 −2		configuration/scripts/Makefile
+15 −0		configuration/scripts/cice.batch.csh
+12 −0		configuration/scripts/cice.launch.csh
+2 −1		configuration/scripts/ice_in
+69 −0		configuration/scripts/machines/Macros.derecho_intel
+2 −2		configuration/scripts/machines/Macros.onyx_intel
+70 −0		configuration/scripts/machines/env.derecho_intel
+5 −5		configuration/scripts/machines/env.nrlssc_gnu
+6 −6		configuration/scripts/machines/env.onyx_cray
+6 −6		configuration/scripts/machines/env.onyx_gnu
+6 −6		configuration/scripts/machines/env.onyx_intel
+2 −0		configuration/scripts/options/set_env.opticep
+2 −2		configuration/scripts/options/set_nml.gx1
+2 −2		configuration/scripts/options/set_nml.gx3
+1 −1		configuration/scripts/options/set_nml.gx3ncarbulk
+1 −1		configuration/scripts/options/set_nml.histinst
+2 −0		configuration/scripts/options/set_nml.jra55
+2 −0		configuration/scripts/options/set_nml.jra55do
+1 −1		configuration/scripts/options/set_nml.qc
+1 −1		configuration/scripts/options/set_nml.run3dt
+2 −2		configuration/scripts/options/set_nml.tx1
+3 −0		configuration/scripts/tests/base_suite.ts
+21 −6		configuration/scripts/tests/baseline.script
+11 −1		configuration/scripts/tests/comparelog.csh
+7 −1		configuration/scripts/tests/unittest_suite.ts
+4 −3		doc/source/cice_index.rst
+11 −6		doc/source/developer_guide/dg_forcing.rst
+3 −3		doc/source/developer_guide/dg_other.rst
+2 −2		doc/source/developer_guide/dg_tools.rst
+1 −1		doc/source/intro/about.rst
+1 −1		doc/source/intro/citing.rst
+5 −5		doc/source/master_list.bib
+2 −2		doc/source/science_guide/sg_coupling.rst
+2 −2		doc/source/science_guide/sg_dynamics.rst
+2 −2		doc/source/science_guide/sg_fundvars.rst
+3 −3		doc/source/science_guide/sg_horiztrans.rst
+1 −1		doc/source/science_guide/sg_tracers.rst
+5 −5		doc/source/user_guide/ug_case_settings.rst
+9 −5		doc/source/user_guide/ug_implementation.rst
+8 −6		doc/source/user_guide/ug_testing.rst
+2 −2		doc/source/user_guide/ug_troubleshooting.rst
+1 −1		icepack