Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 31 commits into from
Sep 7, 2023
Merged

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

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
55a14cf
update fv3
junwang-noaa Jun 2, 2023
1c85768
add fv3atm/mom6/cice6 run time info
junwang-noaa Jun 27, 2023
6932d50
sync fv3atm
junwang-noaa Jul 5, 2023
b58d22c
Merge remote-tracking branch 'upstream/develop' into runtime
junwang-noaa Jul 6, 2023
8aa1bf2
update fv3 and cice
junwang-noaa Jul 6, 2023
3872885
fix syntax
junwang-noaa Jul 6, 2023
9086499
update cice
junwang-noaa Jul 6, 2023
faa5c0f
update fv3
junwang-noaa Jul 6, 2023
3b5bcc7
update fv3
junwang-noaa Jul 6, 2023
9883396
fix mom6 output
junwang-noaa Jul 7, 2023
ba00100
use Denises cice6 branch and fix atm log file
junwang-noaa Jul 10, 2023
0369dc2
update subcomponents
junwang-noaa Aug 17, 2023
6cfe154
Merge remote-tracking branch 'upstream/develop' into runtime
junwang-noaa Aug 17, 2023
de21ba7
fix orion log file
junwang-noaa Aug 17, 2023
d88c457
update mom6
junwang-noaa Aug 17, 2023
72e273e
fix mom6 syntax
junwang-noaa Aug 17, 2023
a8bc920
using stdout for mom6 timing info
junwang-noaa Aug 18, 2023
d396851
update mom6 runtime
junwang-noaa Aug 18, 2023
d11200d
update CICE and mom6 output log file
junwang-noaa Aug 24, 2023
13854c0
Merge remote-tracking branch 'upstream/develop' into runtime
junwang-noaa Aug 24, 2023
3db365d
remove icepack_zsalinity.F90
junwang-noaa Aug 24, 2023
49be742
update fv3
junwang-noaa Aug 29, 2023
c3490e8
sync fv3
junwang-noaa Sep 6, 2023
d12f37b
Merge remote-tracking branch 'upstream/develop' into runtime
junwang-noaa Sep 6, 2023
907b713
add orion RT log: passed
jkbk2004 Sep 7, 2023
0f4726c
add gaea RT log: passed
jkbk2004 Sep 7, 2023
b3c2248
add cheyenne RT logs: passed
zach1221 Sep 7, 2023
990de2d
add jet RT logs: passed
zach1221 Sep 7, 2023
0ed76c3
add hera RT logs: passed
zach1221 Sep 7, 2023
8c30abe
WCOSS2 RT Log
BrianCurtis-NOAA Sep 7, 2023
6a36fac
update subcomponents
junwang-noaa Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = develop
# url = https://github.com/NOAA-EMC/fv3atm
# branch = develop
url = https://github.com/junwang-noaa/fv3atm
branch = runtime_missingvalue
[submodule "WW3"]
path = WW3
url = https://github.com/NOAA-EMC/WW3
Expand All @@ -24,12 +26,16 @@
branch = emc/develop
[submodule "MOM6"]
path = MOM6-interface/MOM6
url = https://github.com/NOAA-EMC/MOM6
branch = dev/emc
# url = https://github.com/NOAA-EMC/MOM6
# branch = dev/emc
url = https://github.com/junwang-noaa/MOM6
branch = runtime
[submodule "CICE"]
path = CICE-interface/CICE
url = https://github.com/NOAA-EMC/CICE
branch = emc/develop
# url = https://github.com/NOAA-EMC/CICE
# branch = emc/develop
url = https://github.com/DeniseWorthen/CICE
branch = feature/updcice
[submodule "CDEPS"]
path = CDEPS-interface/CDEPS
url = https://github.com/NOAA-EMC/CDEPS
Expand Down
2 changes: 1 addition & 1 deletion CICE-interface/CICE
Open in desktop
Submodule CICE updated 39 files
+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
1 change: 0 additions & 1 deletion CICE-interface/cice_files.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 4 files
+4 −2 .gitmodules
+1 −1 atmos_cubed_sphere
+37 −4 fv3_cap.F90
+7 −3 io/module_wrt_grid_comp.F90
2 changes: 1 addition & 1 deletion MOM6-interface/MOM6
Open in desktop
Submodule MOM6 updated 1 files
+39 −4 config_src/drivers/nuopc_cap/mom_cap.F90
3 changes: 3 additions & 0 deletions tests/parm/nems.configure.cpld_noaero_outwav.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ OCN_attributes::
Verbosity = 0
DumpFields = false
ProfileMemory = false
diro = "."
logfile = "mom6.log"
OverwriteSlice = true
mesh_ocn = @[MESHOCN_ICE]
::
Expand Down Expand Up @@ -116,6 +118,7 @@ ALLCOMP_attributes::
ScalarFieldName = cpl_scalars
start_type = @[RUNTYPE]
restart_dir = RESTART/
RunTimeLog = true
DeniseWorthen marked this conversation as resolved.
Show resolved Hide resolved
case_name = ufs.cpld
restart_n = @[RESTART_N]
restart_option = nhours
Expand Down