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

Update CICE, update ice_in for consistency w/ G-W (was #2069) #2027

Merged
merged 40 commits into from
Jan 10, 2024
Merged

Update CICE, update ice_in for consistency w/ G-W (was #2069) #2027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
5a54e8d
update CICE
DeniseWorthen Sep 13, 2023
6540332
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Sep 14, 2023
547d46c
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Sep 19, 2023
a82f207
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Sep 20, 2023
876a2f0
remove comment lines from genf90.pl preprocessing
DeniseWorthen Sep 20, 2023
1cd4d53
Update bl_date.conf
zach1221 Sep 20, 2023
8d66898
add hera RT logs: passed
zach1221 Sep 21, 2023
65ecabe
WCOSS2 RT Log
BrianCurtis-NOAA Sep 21, 2023
da0777d
add orion RT logs: passed
zach1221 Sep 21, 2023
bbb0314
Acorn RT Log
BrianCurtis-NOAA Sep 21, 2023
eecf7be
add hercules RT logs: passed
zach1221 Sep 21, 2023
403a195
add gaea RT logs: passed
zach1221 Sep 21, 2023
33b16f8
add jet RT log: passed
FernandoAndrade-NOAA Sep 21, 2023
a0969cb
update CICE and revert gitmodules
DeniseWorthen Sep 21, 2023
074ca94
Merge branch 'develop' into feature/updcice
DeniseWorthen Dec 5, 2023
502916d
update CICE
DeniseWorthen Dec 5, 2023
a1f9cde
point to CICE branch
DeniseWorthen Dec 5, 2023
beed920
update CICE source file list
DeniseWorthen Dec 5, 2023
4697965
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Dec 6, 2023
1ae6ae2
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Dec 11, 2023
2465bf8
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Dec 22, 2023
0f45043
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Dec 28, 2023
ab5bdb8
updates to ice_in.IN for use in global applications
aerorahul Jan 2, 2024
654d2b2
Merge remote-tracking branch 'Rahul/feature/ice_in_updates' into feat…
DeniseWorthen Jan 4, 2024
ac83fc6
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Jan 4, 2024
c57d0a3
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Jan 8, 2024
90de39f
update CICE submodule w/ empty commit
DeniseWorthen Jan 8, 2024
a4fbd1b
Update bl_date.conf
FernandoAndrade-NOAA Jan 8, 2024
d3599de
add derecho RT log: passed
jkbk2004 Jan 9, 2024
d681c6c
add regional_control_gnu ORT logs: passed
zach1221 Jan 9, 2024
8300736
add cpld_control_nowave_noaero_p8_gnu ORT logs: passed
zach1221 Jan 9, 2024
64a6963
add control_p8_gnu ORT logs: passed
zach1221 Jan 9, 2024
1cf13f8
add jet RT logs: passed
zach1221 Jan 9, 2024
3db43aa
add Gaea C5 RT logs: passed
zach1221 Jan 9, 2024
ca3ddf1
WCOSS2 RT Log
BrianCurtis-NOAA Jan 9, 2024
a8e940c
add hercules RT logs: passed
zach1221 Jan 9, 2024
907b07e
Acorn RT Log
BrianCurtis-NOAA Jan 9, 2024
60688f0
add orion RT logs: passed
zach1221 Jan 9, 2024
5bf5a4a
add hera RT log: passed
jkbk2004 Jan 9, 2024
c9f5f5b
update CICE and revert gitmodules
DeniseWorthen Jan 9, 2024
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
2 changes: 1 addition & 1 deletion CICE-interface/CICE
Open in desktop
Submodule CICE updated 104 files
4 changes: 3 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 @@ -27,7 +27,8 @@ list(APPEND cice_shared_files
#Dynamics List:
CICE/cicecore/cicedyn/dynamics/ice_dyn_eap.F90
CICE/cicecore/cicedyn/dynamics/ice_dyn_evp.F90
CICE/cicecore/cicedyn/dynamics/ice_dyn_evp_1d.F90
CICE/cicecore/cicedyn/dynamics/ice_dyn_evp1d.F90
CICE/cicecore/cicedyn/dynamics/ice_dyn_core1d.F90
CICE/cicecore/cicedyn/dynamics/ice_dyn_shared.F90
CICE/cicecore/cicedyn/dynamics/ice_dyn_vp.F90
CICE/cicecore/cicedyn/dynamics/ice_transport_driver.F90
Expand Down Expand Up @@ -75,6 +76,7 @@ list(APPEND icepack_files
CICE/icepack/columnphysics/icepack_orbital.F90
CICE/icepack/columnphysics/icepack_parameters.F90
CICE/icepack/columnphysics/icepack_shortwave.F90
CICE/icepack/columnphysics/icepack_shortwave_data.F90
CICE/icepack/columnphysics/icepack_snow.F90
CICE/icepack/columnphysics/icepack_therm_bl99.F90
CICE/icepack/columnphysics/icepack_therm_itd.F90
Expand Down
2 changes: 1 addition & 1 deletion tests/bl_date.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20240104
export BL_DATE=20240108
48 changes: 24 additions & 24 deletions tests/logs/OpnReqTests_control_p8_hera.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Fri Jan 5 01:17:18 UTC 2024
Tue Jan 9 03:57:20 UTC 2024
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_225232/control_p8_gnu_bit_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_158723/control_p8_gnu_bit_base
Checking test bit_base control_p8_gnu results ....
Moving baseline bit_base control_p8_gnu files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -51,14 +51,14 @@ Moving baseline bit_base control_p8_gnu files ....
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 292.252815
0: The maximum resident set size (KB) = 1304420
0: The total amount of wall time = 289.756089
0: The maximum resident set size (KB) = 1304612

Test bit_base control_p8_gnu PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_225232/control_p8_gnu_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_158723/control_p8_gnu_dbg_base
Checking test dbg_base control_p8_gnu results ....
Moving baseline dbg_base control_p8_gnu files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -106,14 +106,14 @@ Moving baseline dbg_base control_p8_gnu files ....
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 911.439730
0: The maximum resident set size (KB) = 1285248
0: The total amount of wall time = 902.779464
0: The maximum resident set size (KB) = 1284584

Test dbg_base control_p8_gnu PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_225232/control_p8_gnu_dcp
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_158723/control_p8_gnu_dcp
Checking test dcp control_p8_gnu results ....
Comparing sfcf000.nc .........OK
Comparing sfcf021.nc .........OK
Expand Down Expand Up @@ -160,14 +160,14 @@ Checking test dcp control_p8_gnu results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 255.162624
0: The maximum resident set size (KB) = 1280212
0: The total amount of wall time = 250.216107
0: The maximum resident set size (KB) = 1279588

Test dcp control_p8_gnu PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_225232/control_p8_gnu_mpi
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_158723/control_p8_gnu_mpi
Checking test mpi control_p8_gnu results ....
Comparing sfcf000.nc .........OK
Comparing sfcf021.nc .........OK
Expand Down Expand Up @@ -214,14 +214,14 @@ Checking test mpi control_p8_gnu results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 249.676927
0: The maximum resident set size (KB) = 1280512
0: The total amount of wall time = 253.913258
0: The maximum resident set size (KB) = 1281908

Test mpi control_p8_gnu PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_225232/control_p8_gnu_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_158723/control_p8_gnu_rst
Checking test rst control_p8_gnu results ....
Comparing sfcf000.nc .........OK
Comparing sfcf021.nc .........OK
Expand Down Expand Up @@ -268,14 +268,14 @@ Checking test rst control_p8_gnu results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 253.871636
0: The maximum resident set size (KB) = 1280452
0: The total amount of wall time = 252.882007
0: The maximum resident set size (KB) = 1283956

Test rst control_p8_gnu PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_225232/control_p8_gnu_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_158723/control_p8_gnu_std_base
Checking test std_base control_p8_gnu results ....
Moving baseline std_base control_p8_gnu files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -323,14 +323,14 @@ Moving baseline std_base control_p8_gnu files ....
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 253.376111
0: The maximum resident set size (KB) = 1282064
0: The total amount of wall time = 250.492370
0: The maximum resident set size (KB) = 1280104

Test std_base control_p8_gnu PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_225232/control_p8_gnu_thr
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_158723/control_p8_gnu_thr
Checking test thr control_p8_gnu results ....
Comparing sfcf000.nc .........OK
Comparing sfcf021.nc .........OK
Expand Down Expand Up @@ -377,11 +377,11 @@ Checking test thr control_p8_gnu results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 290.422430
0: The maximum resident set size (KB) = 1281884
0: The total amount of wall time = 257.057734
0: The maximum resident set size (KB) = 1281308

Test thr control_p8_gnu PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Fri Jan 5 02:34:54 UTC 2024
Elapsed time: 01h:17m:36s. Have a nice day!
Tue Jan 9 05:08:51 UTC 2024
Elapsed time: 01h:11m:32s. Have a nice day!
24 changes: 12 additions & 12 deletions tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Fri Jan 5 01:18:23 UTC 2024
Mon Jan 8 22:03:49 UTC 2024
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_169631/cpld_control_nowave_noaero_p8_gnu_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_305596/cpld_control_nowave_noaero_p8_gnu_dbg_base
Checking test dbg_base cpld_control_nowave_noaero_p8_gnu results ....
Moving baseline dbg_base cpld_control_nowave_noaero_p8_gnu files ....
Moving sfcf021.tile1.nc .........OK
Expand Down Expand Up @@ -66,14 +66,14 @@ Moving baseline dbg_base cpld_control_nowave_noaero_p8_gnu files ....
Moving RESTART/iced.2021-03-23-21600.nc .........OK
Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK

0: The total amount of wall time = 1224.717554
0: The maximum resident set size (KB) = 1409892
0: The total amount of wall time = 1253.989573
0: The maximum resident set size (KB) = 1398912

Test dbg_base cpld_control_nowave_noaero_p8_gnu PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_169631/cpld_control_nowave_noaero_p8_gnu_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_305596/cpld_control_nowave_noaero_p8_gnu_rst
Checking test rst cpld_control_nowave_noaero_p8_gnu results ....
Comparing sfcf021.tile1.nc .........OK
Comparing sfcf021.tile2.nc .........OK
Expand Down Expand Up @@ -135,14 +135,14 @@ Checking test rst cpld_control_nowave_noaero_p8_gnu results ....
Comparing RESTART/iced.2021-03-23-21600.nc .........OK
Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK

0: The total amount of wall time = 444.421512
0: The maximum resident set size (KB) = 1400436
0: The total amount of wall time = 389.268869
0: The maximum resident set size (KB) = 1397576

Test rst cpld_control_nowave_noaero_p8_gnu PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_169631/cpld_control_nowave_noaero_p8_gnu_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_305596/cpld_control_nowave_noaero_p8_gnu_std_base
Checking test std_base cpld_control_nowave_noaero_p8_gnu results ....
Moving baseline std_base cpld_control_nowave_noaero_p8_gnu files ....
Moving sfcf021.tile1.nc .........OK
Expand Down Expand Up @@ -205,11 +205,11 @@ Moving baseline std_base cpld_control_nowave_noaero_p8_gnu files ....
Moving RESTART/iced.2021-03-23-21600.nc .........OK
Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK

0: The total amount of wall time = 385.670942
0: The maximum resident set size (KB) = 1402612
0: The total amount of wall time = 393.148290
0: The maximum resident set size (KB) = 1396716

Test std_base cpld_control_nowave_noaero_p8_gnu PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Fri Jan 5 02:10:59 UTC 2024
Elapsed time: 00h:52m:36s. Have a nice day!
Mon Jan 8 23:04:15 UTC 2024
Elapsed time: 01h:00m:26s. Have a nice day!
24 changes: 12 additions & 12 deletions tests/logs/OpnReqTests_regional_control_hera.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Fri Jan 5 01:19:22 UTC 2024
Tue Jan 9 03:56:38 UTC 2024
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_162204/regional_control_gnu_dcp
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_189612/regional_control_gnu_dcp
Checking test dcp regional_control_gnu results ....
Comparing dynf000.nc .........OK
Comparing dynf006.nc .........OK
Expand All @@ -14,14 +14,14 @@ Checking test dcp regional_control_gnu results ....
Comparing NATLEV.GrbF00 .........OK
Comparing NATLEV.GrbF06 .........OK

0: The total amount of wall time = 591.747132
0: The maximum resident set size (KB) = 591600
0: The total amount of wall time = 530.995419
0: The maximum resident set size (KB) = 586644

Test dcp regional_control_gnu PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_162204/regional_control_gnu_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_189612/regional_control_gnu_std_base
Checking test std_base regional_control_gnu results ....
Moving baseline std_base regional_control_gnu files ....
Moving dynf000.nc .........OK
Expand All @@ -33,14 +33,14 @@ Moving baseline std_base regional_control_gnu files ....
Moving NATLEV.GrbF00 .........OK
Moving NATLEV.GrbF06 .........OK

0: The total amount of wall time = 521.315673
0: The maximum resident set size (KB) = 589700
0: The total amount of wall time = 527.560869
0: The maximum resident set size (KB) = 590452

Test std_base regional_control_gnu PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_162204/regional_control_gnu_thr
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_189612/regional_control_gnu_thr
Checking test thr regional_control_gnu results ....
Comparing dynf000.nc .........OK
Comparing dynf006.nc .........OK
Expand All @@ -51,11 +51,11 @@ Checking test thr regional_control_gnu results ....
Comparing NATLEV.GrbF00 .........OK
Comparing NATLEV.GrbF06 .........OK

0: The total amount of wall time = 522.261141
0: The maximum resident set size (KB) = 586868
0: The total amount of wall time = 524.852814
0: The maximum resident set size (KB) = 588468

Test thr regional_control_gnu PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Fri Jan 5 01:59:03 UTC 2024
Elapsed time: 00h:39m:41s. Have a nice day!
Tue Jan 9 04:34:16 UTC 2024
Elapsed time: 00h:37m:39s. Have a nice day!
Loading