Merge updates in submodules of CICE, CMEPS, MOM6, WW3, and stochastic…

…_physics Upp CATChem grib2 output
zhanglikate · May 14, 2024 · a0bea7e · a0bea7e
1 parent 2ce5436
commit a0bea7e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/CICE-interface/CICE b/CICE-interface/CICE
diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
diff --git a/FV3 b/FV3
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
diff --git a/WW3 b/WW3
diff --git a/stochastic_physics b/stochastic_physics
+1 −1		.github/PULL_REQUEST_TEMPLATE.md
+4 −2		.github/workflows/test-cice.yml
+16 −4		cicecore/cicedyn/analysis/ice_history.F90
+14 −8		cicecore/cicedyn/analysis/ice_history_shared.F90
+19 −3		cicecore/cicedyn/dynamics/ice_dyn_eap.F90
+52 −11		cicecore/cicedyn/dynamics/ice_dyn_evp.F90
+104 −10		cicecore/cicedyn/dynamics/ice_dyn_shared.F90
+12 −19		cicecore/cicedyn/dynamics/ice_dyn_vp.F90
+29 −112		cicecore/cicedyn/dynamics/ice_transport_remap.F90
+2 −1		cicecore/cicedyn/general/ice_flux.F90
+9 −1		cicecore/cicedyn/general/ice_forcing.F90
+247 −56		cicecore/cicedyn/general/ice_init.F90
+2 −0		cicecore/cicedyn/general/ice_state.F90
+27 −18		cicecore/cicedyn/infrastructure/comm/mpi/ice_global_reductions.F90
+27 −18		cicecore/cicedyn/infrastructure/comm/serial/ice_global_reductions.F90
+27 −27		cicecore/cicedyn/infrastructure/ice_blocks.F90
+45 −34		cicecore/cicedyn/infrastructure/ice_domain.F90
+50 −141		cicecore/cicedyn/infrastructure/ice_grid.F90
+2 −1		cicecore/cicedyn/infrastructure/ice_memusage.F90
+636 −655		cicecore/cicedyn/infrastructure/ice_read_write.F90
+1 −1		cicecore/cicedyn/infrastructure/ice_restoring.F90
+1 −0		cicecore/cicedyn/infrastructure/io/io_binary/ice_history_write.F90
+12 −12		cicecore/cicedyn/infrastructure/io/io_binary/ice_restart.F90
+1,032 −1,061		cicecore/cicedyn/infrastructure/io/io_netcdf/ice_history_write.F90
+256 −207		cicecore/cicedyn/infrastructure/io/io_netcdf/ice_restart.F90
+656 −535		cicecore/cicedyn/infrastructure/io/io_pio2/ice_history_write.F90
+156 −65		cicecore/cicedyn/infrastructure/io/io_pio2/ice_pio.F90
+589 −541		cicecore/cicedyn/infrastructure/io/io_pio2/ice_restart.F90
+32 −1		cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90
+44 −34		cicecore/drivers/nuopc/cmeps/ice_import_export.F90
+1 −7		cicecore/drivers/nuopc/cmeps/ice_mesh_mod.F90
+1 −1		cicecore/drivers/standalone/cice/CICE_InitMod.F90
+9 −2		cicecore/shared/ice_restart_shared.F90
+13 −0		configuration/scripts/ice_in
+6 −1		configuration/scripts/machines/Macros.conda_macos
+2 −0		configuration/scripts/machines/env.derecho_cray
+2 −0		configuration/scripts/machines/env.derecho_gnu
+2 −0		configuration/scripts/machines/env.derecho_intel
+2 −0		configuration/scripts/machines/env.derecho_intelclassic
+2 −0		configuration/scripts/machines/env.derecho_inteloneapi
+2 −0		configuration/scripts/machines/env.derecho_nvhpc
+1 −0		configuration/scripts/machines/environment.yml
+1 −0		configuration/scripts/options/set_env.iopio1
+0 −1		configuration/scripts/options/set_env.iopio1p
+0 −1		configuration/scripts/options/set_env.iopio2p
+1 −0		configuration/scripts/options/set_nml.histall
+1 −0		configuration/scripts/options/set_nml.histdbg
+2 −0		configuration/scripts/options/set_nml.iobinary
+2 −0		configuration/scripts/options/set_nml.iocdf1
+2 −0		configuration/scripts/options/set_nml.iocdf2
+2 −0		configuration/scripts/options/set_nml.iocdf5
+2 −0		configuration/scripts/options/set_nml.iohdf5
+4 −0		configuration/scripts/options/set_nml.iohdf5opts
+0 −2		configuration/scripts/options/set_nml.iopio1
+0 −2		configuration/scripts/options/set_nml.iopio1p
+0 −2		configuration/scripts/options/set_nml.iopio2
+0 −2		configuration/scripts/options/set_nml.iopio2p
+10 −0		configuration/scripts/options/set_nml.iopioopts
+2 −0		configuration/scripts/options/set_nml.iopnetcdf1
+2 −0		configuration/scripts/options/set_nml.iopnetcdf2
+2 −0		configuration/scripts/options/set_nml.iopnetcdf5
+3 −3		configuration/scripts/tests/gridsys_suite.ts
+41 −67		configuration/scripts/tests/io_suite.ts
+13 −0		doc/source/cice_index.rst
+8 −2		doc/source/developer_guide/dg_about.rst
+3 −1		doc/source/developer_guide/dg_infra.rst
+51 −14		doc/source/user_guide/ug_case_settings.rst
+97 −29		doc/source/user_guide/ug_implementation.rst
+65 −18		doc/source/user_guide/ug_running.rst
+5 −0		doc/source/user_guide/ug_testing.rst
+35 −14		cesm/driver/esm.F90
+30 −10		mediator/med.F90
+3 −3		mediator/med_fraction_mod.F90
+6 −2		mediator/med_internalstate_mod.F90
+20 −21		mediator/med_io_mod.F90
+55 −51		mediator/med_map_mod.F90
+17 −31		mediator/med_phases_history_mod.F90
+4 −0		mediator/med_phases_restart_mod.F90
+119 −21		config_src/drivers/nuopc_cap/mom_cap.F90
+8 −1		config_src/drivers/nuopc_cap/mom_cap_methods.F90
+2 −0		config_src/external/GFDL_ocean_BGC/FMS_coupler_util.F90
+29 −0		config_src/external/GFDL_ocean_BGC/generic_tracer_utils.F90
+19 −0		config_src/external/database_comms/database_client_interface.F90
+13 −2		config_src/infra/FMS1/MOM_domain_infra.F90
+10 −0		config_src/infra/FMS2/MOM_coms_infra.F90
+14 −3		config_src/infra/FMS2/MOM_domain_infra.F90
+3 −3		src/ALE/MOM_remapping.F90
+4 −4		src/core/MOM.F90
+1 −1		src/core/MOM_open_boundary.F90
+319 −18		src/framework/MOM_domains.F90
+2 −0		src/framework/MOM_io_file.F90
+5 −1		src/framework/MOM_netcdf.F90
+1 −1		src/framework/posix.F90
+1 −1		src/ice_shelf/MOM_ice_shelf.F90
+3 −3		src/ice_shelf/MOM_ice_shelf_diag_mediator.F90
+1 −1		src/ocean_data_assim/MOM_oda_driver.F90
+314 −252		src/parameterizations/lateral/MOM_hor_visc.F90
+13 −5		.github/workflows/intel.yml
+38 −11		model/inp/ww3_grid.inp
+1 −1		model/inp/ww3_ounf.inp
+4 −3		model/inp/ww3_shel.inp
+24 −52		model/src/w3adatmd.F90
+11 −0		model/src/w3gdatmd.F90
+17 −1		model/src/w3gridmd.F90
+6 −15		model/src/w3idatmd.F90
+21 −12		model/src/w3initmd.F90
+71 −172		model/src/w3iogomd.F90
+3 −6		model/src/w3iogoncdmd.F90
+10 −0		model/src/w3iogrmd.F90
+18 −0		model/src/w3iorsmd.F90
+2 −4		model/src/w3odatmd.F90
+25 −0		model/src/w3ounfmetamd.F90
+12 −2		model/src/wav_comp_nuopc.F90
+4 −3		model/src/wav_grdout.F90
+46 −10		model/src/wav_import_export.F90
+18 −1		model/src/ww3_ounf.F90
+52 −1		model/src/ww3_outf.F90
+121 −110		regtests/bin/matrix.base
+7 −6		regtests/bin/matrix_cmake_datarmor
+9 −8		regtests/bin/matrix_cmake_milhydro
+1 −0		regtests/bin/matrix_cmake_ncep
+6 −5		regtests/bin/matrix_cmake_ukmo_cray
+58 −0		regtests/ww3_tp2.22/info
+1 −0		regtests/ww3_tp2.22/input/switch
+6 −0		regtests/ww3_tp2.22/input/track_i.ww3
+33 −0		regtests/ww3_tp2.22/input/ww3_grid.inp
+33 −0		regtests/ww3_tp2.22/input/ww3_grid_sdtail.inp
+43 −0		regtests/ww3_tp2.22/input/ww3_ounf.inp
+119 −0		regtests/ww3_tp2.22/input/ww3_ounp.inp
+10 −0		regtests/ww3_tp2.22/input/ww3_outf.inp
+11 −0		regtests/ww3_tp2.22/input/ww3_outp_spec.inp
+10 −0		regtests/ww3_tp2.22/input/ww3_outp_tab51.inp
+10 −0		regtests/ww3_tp2.22/input/ww3_outp_tab52.inp
+10 −0		regtests/ww3_tp2.22/input/ww3_outp_tab53.inp
+42 −0		regtests/ww3_tp2.22/input/ww3_shel.inp
+5 −0		regtests/ww3_tp2.22/input/ww3_strt.inp
+1 −1		cellular_automata_global.F90
+1 −1		cellular_automata_sgs.F90
+5 −0		plumes.F90
+4 −3		spectral_transforms.F90
+1 −3		stochy_data_mod.F90
+2 −2		stochy_patterngenerator.F90
+4 −2		update_ca.F90