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

Jump to bottom

Remove compiler warnings for CMEPS and CICE; Add traditional threading templates for global apps and append _esmf for templates using ESMF-managed threading (was #2179) #2172

Merged
merged 24 commits into from
Mar 12, 2024
Merged

Remove compiler warnings for CMEPS and CICE; Add traditional threading templates for global apps and append _esmf for templates using ESMF-managed threading (was #2179) #2172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5038ed5
add traditional threading version files for a atm, atmaero and leapfr…
aerorahul Feb 7, 2024
d8a840c
update test configurations for updated template names
aerorahul Feb 7, 2024
b09ecf9
point to feature branches
DeniseWorthen Mar 5, 2024
a07bd60
Merge branch 'develop' into feature/ufs-threading
aerorahul Mar 5, 2024
85ab631
commit test_changes.list
DeniseWorthen Mar 6, 2024
7a5a401
revert tests to traditional threading
aerorahul Mar 7, 2024
c61f374
use the updated template names for esmf-threading as in develop
aerorahul Mar 7, 2024
5186106
Merge branch 'feature/ufs-threading' of https://github.com/aerorahul/…
aerorahul Mar 7, 2024
815cb22
use the updated template names for esmf-threading as in develop
aerorahul Mar 7, 2024
db92ca0
Merge remote-tracking branch 'Rahul/feature/ufs-threading' into featu…
DeniseWorthen Mar 11, 2024
0993150
Merge branch 'ufs-community:develop' into feature/nowarn
DeniseWorthen Mar 11, 2024
ffb83d4
[AutoRT] Derecho Job Completed.
epic-cicd-jenkins Mar 11, 2024
602e838
add jet RT log passed
FernandoAndrade-NOAA Mar 12, 2024
c30e3ef
[AutoRT] Hercules Job Completed.
epic-cicd-jenkins Mar 12, 2024
0e0a259
[AutoRT] Gaea Job Completed.
epic-cicd-jenkins Mar 12, 2024
f12c33f
[AutoRT] Orion Job Failed!
epic-cicd-jenkins Mar 12, 2024
741c596
Merge branch 'feature/nowarn' of github.com:DeniseWorthen/ufs-weather…
epic-cicd-jenkins Mar 12, 2024
8f3ed36
[AutoRT] Gaea Job Completed.
epic-cicd-jenkins Mar 12, 2024
b3f190b
WCOSS2 RT Log
BrianCurtis-NOAA Mar 12, 2024
9e09c11
add hera RT logs: passed
zach1221 Mar 12, 2024
41e28af
add control_p8_gnu ORT logs: passed
zach1221 Mar 12, 2024
680cd17
add regional_control_gnu ORT logs: passed
zach1221 Mar 12, 2024
cea1dc3
add cpld_control_gnu ORT logs: passed
zach1221 Mar 12, 2024
380e7a0
update submodules and revert gitmodules
DeniseWorthen Mar 12, 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 2 files
+5 −3 cicecore/drivers/nuopc/cmeps/ice_import_export.F90
+3 −1 cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90
2 changes: 1 addition & 1 deletion CMEPS-interface/CMEPS
Open in desktop
Submodule CMEPS updated 1 files
+4 −1 ufs/glc_elevclass_mod.F90
2 changes: 1 addition & 1 deletion tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ export DumpFields="false"
export_fv3 ()
{
# ufs.configure defaults
export UFS_CONFIGURE=ufs.configure.atm.IN
export UFS_CONFIGURE=ufs.configure.atm_esmf.IN
export MODEL_CONFIGURE=model_configure.IN
export atm_model=fv3

Expand Down
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 Mar 8 03:19:22 UTC 2024
Mon Mar 11 20:39:48 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_135562/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_185088/bit_base_bit_base
Checking test bit_base results ....
Moving baseline bit_base files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -51,14 +51,14 @@ Moving baseline bit_base 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 = 281.726798
0: The maximum resident set size (KB) = 1310164
0: The total amount of wall time = 280.439132
0: The maximum resident set size (KB) = 1308136

Test bit_base 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_135562/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_185088/dbg_base_dbg_base
Checking test dbg_base results ....
Moving baseline dbg_base files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -106,14 +106,14 @@ Moving baseline dbg_base 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 = 899.537419
0: The maximum resident set size (KB) = 1292576
0: The total amount of wall time = 913.067093
0: The maximum resident set size (KB) = 1275248

Test dbg_base 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_135562/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_185088/dcp_dcp
Checking test dcp results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -160,14 +160,14 @@ Checking test dcp results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

0: The total amount of wall time = 247.982005
0: The maximum resident set size (KB) = 1281952
0: The total amount of wall time = 251.823722
0: The maximum resident set size (KB) = 1279488

Test dcp 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_135562/mpi_mpi
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_185088/mpi_mpi
Checking test mpi results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -214,14 +214,14 @@ Checking test mpi results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

0: The total amount of wall time = 251.637706
0: The maximum resident set size (KB) = 1282692
0: The total amount of wall time = 252.776253
0: The maximum resident set size (KB) = 1282664

Test mpi 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_135562/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_185088/rst_rst
Checking test rst results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -268,14 +268,14 @@ Checking test rst results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

0: The total amount of wall time = 247.894872
0: The maximum resident set size (KB) = 1282620
0: The total amount of wall time = 245.047404
0: The maximum resident set size (KB) = 1282668

Test rst 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_135562/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_185088/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -323,14 +323,14 @@ Moving baseline std_base 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 = 247.036431
0: The maximum resident set size (KB) = 1286556
0: The total amount of wall time = 250.468466
0: The maximum resident set size (KB) = 1286552

Test std_base 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_135562/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_185088/thr_thr
Checking test thr results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -377,11 +377,11 @@ Checking test thr results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

0: The total amount of wall time = 249.898262
0: The maximum resident set size (KB) = 1279316
0: The total amount of wall time = 247.887313
0: The maximum resident set size (KB) = 1284976

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Fri Mar 8 08:01:31 UTC 2024
Elapsed time: 04h:42m:10s. Have a nice day!
Tue Mar 12 00:01:04 UTC 2024
Elapsed time: 03h:21m:16s. 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 Mar 8 13:50:47 UTC 2024
Tue Mar 12 13:26:39 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_116220/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_221711/dbg_base_dbg_base
Checking test dbg_base results ....
Moving baseline dbg_base files ....
Moving sfcf021.tile1.nc .........OK
Expand Down Expand Up @@ -66,14 +66,14 @@ Moving baseline dbg_base 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 = 1247.398743
0: The maximum resident set size (KB) = 1418360
0: The total amount of wall time = 1222.768545
0: The maximum resident set size (KB) = 1415220

Test dbg_base 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_116220/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_221711/rst_rst
Checking test rst results ....
Comparing sfcf021.tile1.nc .....USING NCCMP......OK
Comparing sfcf021.tile2.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -135,14 +135,14 @@ Checking test rst results ....
Comparing RESTART/iced.2021-03-23-21600.nc .....USING NCCMP......OK
Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......OK

0: The total amount of wall time = 380.961022
0: The maximum resident set size (KB) = 1408744
0: The total amount of wall time = 523.989093
0: The maximum resident set size (KB) = 1403904

Test rst 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_116220/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_221711/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving sfcf021.tile1.nc .........OK
Expand Down Expand Up @@ -205,11 +205,11 @@ Moving baseline std_base 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 = 381.454424
0: The maximum resident set size (KB) = 1407480
0: The total amount of wall time = 383.103653
0: The maximum resident set size (KB) = 1405844

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Fri Mar 8 16:18:50 UTC 2024
Elapsed time: 02h:28m:03s. Have a nice day!
Tue Mar 12 14:29:39 UTC 2024
Elapsed time: 01h:03m:01s. 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 Mar 8 12:38:35 UTC 2024
Tue Mar 12 03:42:07 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_140241/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_136710/dcp_dcp
Checking test dcp results ....
Comparing dynf000.nc .....USING NCCMP......OK
Comparing dynf006.nc .....USING NCCMP......OK
Expand All @@ -14,14 +14,14 @@ Checking test dcp results ....
Comparing NATLEV.GrbF00 .....USING CMP......OK
Comparing NATLEV.GrbF06 .....USING CMP......OK

0: The total amount of wall time = 518.666889
0: The maximum resident set size (KB) = 591560
0: The total amount of wall time = 524.495732
0: The maximum resident set size (KB) = 589572

Test dcp 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_140241/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_136710/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving dynf000.nc .........OK
Expand All @@ -33,14 +33,14 @@ Moving baseline std_base files ....
Moving NATLEV.GrbF00 .........OK
Moving NATLEV.GrbF06 .........OK

0: The total amount of wall time = 510.630263
0: The maximum resident set size (KB) = 589856
0: The total amount of wall time = 522.595246
0: The maximum resident set size (KB) = 589600

Test std_base 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_140241/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_136710/thr_thr
Checking test thr results ....
Comparing dynf000.nc .....USING NCCMP......OK
Comparing dynf006.nc .....USING NCCMP......OK
Expand All @@ -51,11 +51,11 @@ Checking test thr results ....
Comparing NATLEV.GrbF00 .....USING CMP......OK
Comparing NATLEV.GrbF06 .....USING CMP......OK

0: The total amount of wall time = 526.308695
0: The maximum resident set size (KB) = 591688
0: The total amount of wall time = 514.250208
0: The maximum resident set size (KB) = 591872

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Fri Mar 8 13:43:33 UTC 2024
Elapsed time: 01h:04m:59s. Have a nice day!
Tue Mar 12 04:20:05 UTC 2024
Elapsed time: 00h:37m:59s. Have a nice day!
Loading