Add run time information and update fv3 to use unified missing value (#…

…1823) * add fv3atm/mom6/cice6 run time info * update fv3 and cice * fix mom6 output * use Denises cice6 branch and fix atm log file * using stdout for mom6 timing info * update mom6 runtime * update CICE and mom6 output log file * remove icepack_zsalinity.F90
ufs-community · Sep 7, 2023 · 1787f26 · 1787f26
1 parent d3daaf1
commit 1787f26
Show file tree

Hide file tree

Showing 11 changed files with 3,663 additions and 3,664 deletions.
diff --git a/CICE-interface/CICE b/CICE-interface/CICE
diff --git a/CICE-interface/cice_files.cmake b/CICE-interface/cice_files.cmake
@@ -86,7 +86,6 @@ list(APPEND icepack_files
   CICE/icepack/columnphysics/icepack_wavefracspec.F90
   CICE/icepack/columnphysics/icepack_zbgc.F90
   CICE/icepack/columnphysics/icepack_zbgc_shared.F90
-  CICE/icepack/columnphysics/icepack_zsalinity.F90
 )
 
 list(APPEND cice_shared_files_c

diff --git a/FV3 b/FV3
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
diff --git a/tests/logs/RegressionTests_cheyenne.log b/tests/logs/RegressionTests_cheyenne.log
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/nems.configure.cpld_noaero_outwav.IN b/tests/parm/nems.configure.cpld_noaero_outwav.IN
@@ -33,6 +33,8 @@ OCN_attributes::
   Verbosity = 0
   DumpFields = false
   ProfileMemory = false
+  diro = "."
+  logfile = "mom6.log"
   OverwriteSlice = true
   mesh_ocn = @[MESHOCN_ICE]
 ::
@@ -119,6 +121,7 @@ ALLCOMP_attributes::
       ScalarFieldName = cpl_scalars
       start_type = @[RUNTYPE]
       restart_dir = RESTART/
+      RunTimeLog = true
       case_name = ufs.cpld
       restart_n = @[RESTART_N]
       restart_option = nhours
+35 −8		.github/workflows/test-cice.yml
+3 −222		cicecore/cicedyn/analysis/ice_diagnostics_bgc.F90
+2 −2		cicecore/cicedyn/analysis/ice_history.F90
+17 −113		cicecore/cicedyn/analysis/ice_history_bgc.F90
+2 −6		cicecore/cicedyn/dynamics/ice_transport_driver.F90
+0 −10		cicecore/cicedyn/general/ice_flux.F90
+0 −6		cicecore/cicedyn/general/ice_flux_bgc.F90
+1 −1		cicecore/cicedyn/general/ice_init.F90
+15 −23		cicecore/cicedyn/general/ice_step_mod.F90
+1 −0		cicecore/cicedyn/infrastructure/ice_read_write.F90
+5 −15		cicecore/cicedyn/infrastructure/io/io_binary/ice_restart.F90
+2 −13		cicecore/cicedyn/infrastructure/io/io_netcdf/ice_restart.F90
+2 −12		cicecore/cicedyn/infrastructure/io/io_pio2/ice_restart.F90
+4 −7		cicecore/drivers/nuopc/cmeps/CICE_InitMod.F90
+23 −16		cicecore/drivers/nuopc/cmeps/CICE_RunMod.F90
+76 −8		cicecore/drivers/nuopc/cmeps/cice_wrapper_mod.F90
+24 −3		cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90
+4 −6		cicecore/drivers/standalone/cice/CICE_InitMod.F90
+7 −12		cicecore/drivers/standalone/cice/CICE_RunMod.F90
+59 −16		cicecore/drivers/unittest/gridavgchk/CICE_InitMod.F90
+59 −16		cicecore/drivers/unittest/halochk/CICE_InitMod.F90
+4 −6		cicecore/drivers/unittest/opticep/CICE_InitMod.F90
+7 −12		cicecore/drivers/unittest/opticep/CICE_RunMod.F90
+21 −123		cicecore/drivers/unittest/opticep/ice_init_column.F90
+12 −20		cicecore/drivers/unittest/opticep/ice_step_mod.F90
+59 −17		cicecore/drivers/unittest/sumchk/CICE_InitMod.F90
+17 −58		cicecore/shared/ice_arrays_column.F90
+19 −119		cicecore/shared/ice_init_column.F90
+8 −86		cicecore/shared/ice_restart_column.F90
+4 −2		configuration/scripts/cice.batch.csh
+2 −2		configuration/scripts/cice.launch.csh
+0 −56		configuration/scripts/machines/Macros.badger_intel
+58 −0		configuration/scripts/machines/Macros.chicoma_intel
+6 −4		configuration/scripts/machines/Macros.conda_macos
+0 −47		configuration/scripts/machines/env.badger_intel
+71 −0		configuration/scripts/machines/env.chicoma_intel
+0 −8		configuration/scripts/options/set_nml.zsal
+2 −2		doc/source/user_guide/ug_case_settings.rst
+1 −1		icepack
+37 −4		fv3_cap.F90
+7 −3		io/module_wrt_grid_comp.F90
+19 −9		io/post_fv3.F90
+1 −1		upp