diff --git a/.gitmodules b/.gitmodules index 5ece87098e..caf9f3a3d1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "FV3"] path = FV3 - url = https://github.com/NOAA-EMC/fv3atm + url = https://github.com/pjpegion/fv3atm branch = develop [submodule "WW3"] path = WW3 diff --git a/FV3 b/FV3 index 61f060f3c0..e0bad1e0e0 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 61f060f3c09192c0c53e867a1b14edea83b872fd +Subproject commit e0bad1e0e049901c36bd321a4324ed4da040c0a1 diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log index b7ca3056af..c3d2b75835 100644 --- a/tests/RegressionTests_hera.intel.log +++ b/tests/RegressionTests_hera.intel.log @@ -1,4 +1,32 @@ +<<<<<<< HEAD +<<<<<<< HEAD +Mon May 16 19:40:38 UTC 2022 +Start Regression test + +Compile 001 elapsed time 333 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_thompson_mynn_RRTMGP,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release +Compile 002 elapsed time 328 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release +Compile 003 elapsed time 327 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_RRTMGP,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp -DMPI=ON -DCMAKE_BUILD_TYPE=Release + +baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220503/INTEL/control +working dir = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_11780/control +Checking test 001 control results .... + Comparing sfcf000.nc .........OK + Comparing sfcf021.nc .........OK + Comparing sfcf024.nc .........OK + Comparing atmf000.nc .........OK + Comparing atmf021.nc .........OK + Comparing atmf024.nc .........OK + Comparing GFSFLX.GrbF00 .........OK + Comparing GFSFLX.GrbF21 .........OK + Comparing GFSFLX.GrbF24 .........OK + Comparing GFSPRS.GrbF00 .........OK + Comparing GFSPRS.GrbF21 .........OK + Comparing GFSPRS.GrbF24 .........OK +======= +Tue May 31 18:28:49 UTC 2022 +======= Thu Jun 2 17:17:58 UTC 2022 +>>>>>>> upstream/develop Start Regression test Compile 001 elapsed time 559 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON @@ -46,6 +74,7 @@ Checking test 001 cpld_control_p8 results .... Comparing atmf024.tile5.nc .........OK Comparing atmf024.tile6.nc .........OK Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK +>>>>>>> upstream/develop Comparing RESTART/coupler.res .........OK Comparing RESTART/fv_core.res.nc .........OK Comparing RESTART/fv_core.res.tile1.nc .........OK @@ -78,6 +107,30 @@ Checking test 001 cpld_control_p8 results .... Comparing RESTART/sfc_data.tile4.nc .........OK Comparing RESTART/sfc_data.tile5.nc .........OK Comparing RESTART/sfc_data.tile6.nc .........OK +<<<<<<< HEAD + + 0: The total amount of wall time = 126.225187 + 0: The maximum resident set size (KB) = 469256 + +Test 001 control PASS + + +baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220503/INTEL/control_p8 +working dir = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_11780/control_p8 +Checking test 002 control_p8 results .... + Comparing sfcf000.nc .........OK + Comparing sfcf021.nc .........OK + Comparing sfcf024.nc .........OK + Comparing atmf000.nc .........OK + Comparing atmf021.nc .........OK + Comparing atmf024.nc .........OK + Comparing GFSFLX.GrbF00 .........OK + Comparing GFSFLX.GrbF21 .........OK + Comparing GFSFLX.GrbF24 .........OK + Comparing GFSPRS.GrbF00 .........OK + Comparing GFSPRS.GrbF21 .........OK + Comparing GFSPRS.GrbF24 .........OK +======= Comparing RESTART/MOM.res.nc .........OK Comparing RESTART/iced.2021-03-23-21600.nc .........OK Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK @@ -226,6 +279,7 @@ Checking test 004 cpld_decomp_p8 results .... Comparing atmf024.tile5.nc .........OK Comparing atmf024.tile6.nc .........OK Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK +>>>>>>> upstream/develop Comparing RESTART/coupler.res .........OK Comparing RESTART/fv_core.res.nc .........OK Comparing RESTART/fv_core.res.tile1.nc .........OK @@ -258,6 +312,22 @@ Checking test 004 cpld_decomp_p8 results .... Comparing RESTART/sfc_data.tile4.nc .........OK Comparing RESTART/sfc_data.tile5.nc .........OK Comparing RESTART/sfc_data.tile6.nc .........OK +<<<<<<< HEAD + + 0: The total amount of wall time = 193.123019 + 0: The maximum resident set size (KB) = 972528 + +Test 002 control_p8 PASS + + +baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220503/INTEL/control +working dir = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_11780/control_restart +Checking test 003 control_restart results .... + Comparing sfcf024.nc .........OK + Comparing atmf024.nc .........OK + Comparing GFSFLX.GrbF24 .........OK + Comparing GFSPRS.GrbF24 .........OK +======= Comparing RESTART/MOM.res.nc .........OK Comparing RESTART/iced.2021-03-23-21600.nc .........OK Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK @@ -286,6 +356,7 @@ Checking test 005 cpld_mpi_p8 results .... Comparing atmf024.tile5.nc .........OK Comparing atmf024.tile6.nc .........OK Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK +>>>>>>> upstream/develop Comparing RESTART/coupler.res .........OK Comparing RESTART/fv_core.res.nc .........OK Comparing RESTART/fv_core.res.tile1.nc .........OK @@ -318,6 +389,30 @@ Checking test 005 cpld_mpi_p8 results .... Comparing RESTART/sfc_data.tile4.nc .........OK Comparing RESTART/sfc_data.tile5.nc .........OK Comparing RESTART/sfc_data.tile6.nc .........OK +<<<<<<< HEAD + + 0: The total amount of wall time = 68.156148 + 0: The maximum resident set size (KB) = 208788 + +Test 003 control_restart PASS + + +baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220503/INTEL/rap_control +working dir = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_11780/rap_control +Checking test 004 rap_control results .... + Comparing sfcf000.nc .........OK + Comparing sfcf021.nc .........OK + Comparing sfcf024.nc .........OK + Comparing atmf000.nc .........OK + Comparing atmf021.nc .........OK + Comparing atmf024.nc .........OK + Comparing GFSFLX.GrbF00 .........OK + Comparing GFSFLX.GrbF21 .........OK + Comparing GFSFLX.GrbF24 .........OK + Comparing GFSPRS.GrbF00 .........OK + Comparing GFSPRS.GrbF21 .........OK + Comparing GFSPRS.GrbF24 .........OK +======= Comparing RESTART/MOM.res.nc .........OK Comparing RESTART/iced.2021-03-23-21600.nc .........OK Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK @@ -346,6 +441,7 @@ Checking test 006 cpld_control_c192_p8 results .... Comparing atmf030.tile5.nc .........OK Comparing atmf030.tile6.nc .........OK Comparing gocart.inst_aod.20210323_1200z.nc4 .........OK +>>>>>>> upstream/develop Comparing RESTART/coupler.res .........OK Comparing RESTART/fv_core.res.nc .........OK Comparing RESTART/fv_core.res.tile1.nc .........OK @@ -378,6 +474,30 @@ Checking test 006 cpld_control_c192_p8 results .... Comparing RESTART/sfc_data.tile4.nc .........OK Comparing RESTART/sfc_data.tile5.nc .........OK Comparing RESTART/sfc_data.tile6.nc .........OK +<<<<<<< HEAD + + 0: The total amount of wall time = 429.128420 + 0: The maximum resident set size (KB) = 840392 + +Test 004 rap_control PASS + + +baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220503/INTEL/rap_rrtmgp +working dir = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_11780/rap_rrtmgp +Checking test 005 rap_rrtmgp results .... + Comparing sfcf000.nc .........OK + Comparing sfcf021.nc .........OK + Comparing sfcf024.nc .........OK + Comparing atmf000.nc .........OK + Comparing atmf021.nc .........OK + Comparing atmf024.nc .........OK + Comparing GFSFLX.GrbF00 .........OK + Comparing GFSFLX.GrbF21 .........OK + Comparing GFSFLX.GrbF24 .........OK + Comparing GFSPRS.GrbF00 .........OK + Comparing GFSPRS.GrbF21 .........OK + Comparing GFSPRS.GrbF24 .........OK +======= Comparing RESTART/MOM.res.nc .........OK Comparing RESTART/iced.2021-03-23-43200.nc .........OK Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-43200.nc .........OK @@ -406,6 +526,7 @@ Checking test 007 cpld_restart_c192_p8 results .... Comparing atmf030.tile5.nc .........OK Comparing atmf030.tile6.nc .........OK Comparing gocart.inst_aod.20210323_1200z.nc4 .........OK +>>>>>>> upstream/develop Comparing RESTART/coupler.res .........OK Comparing RESTART/fv_core.res.nc .........OK Comparing RESTART/fv_core.res.tile1.nc .........OK @@ -438,6 +559,36 @@ Checking test 007 cpld_restart_c192_p8 results .... Comparing RESTART/sfc_data.tile4.nc .........OK Comparing RESTART/sfc_data.tile5.nc .........OK Comparing RESTART/sfc_data.tile6.nc .........OK +<<<<<<< HEAD + + 0: The total amount of wall time = 456.754849 + 0: The maximum resident set size (KB) = 959940 + +Test 005 rap_rrtmgp PASS + + +baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220503/INTEL/control_rrtmgp +working dir = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_11780/control_rrtmgp +Checking test 006 control_rrtmgp results .... + Comparing sfcf000.nc .........OK + Comparing sfcf024.nc .........OK + Comparing atmf000.nc .........OK + Comparing atmf024.nc .........OK + Comparing GFSFLX.GrbF00 .........OK + Comparing GFSFLX.GrbF24 .........OK + Comparing GFSPRS.GrbF00 .........OK + Comparing GFSPRS.GrbF24 .........OK + + 0: The total amount of wall time = 185.871953 + 0: The maximum resident set size (KB) = 605824 + +Test 006 control_rrtmgp PASS + + +baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220503/INTEL/control_csawmg +working dir = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_11780/control_csawmg +Checking test 007 control_csawmg results .... +======= Comparing RESTART/MOM.res.nc .........OK Comparing RESTART/iced.2021-03-23-43200.nc .........OK Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-43200.nc .........OK @@ -3152,8 +3303,14 @@ Test 124 control_atmwav PASS baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220601/INTEL/atmaero_control_p8 +<<<<<<< HEAD +working dir = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_29376/atmaero_control_p8 +Checking test 124 atmaero_control_p8 results .... +>>>>>>> upstream/develop +======= working dir = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_29839/atmaero_control_p8 Checking test 125 atmaero_control_p8 results .... +>>>>>>> upstream/develop Comparing sfcf000.nc .........OK Comparing sfcf024.nc .........OK Comparing atmf000.nc .........OK @@ -3162,6 +3319,18 @@ Checking test 125 atmaero_control_p8 results .... Comparing GFSFLX.GrbF24 .........OK Comparing GFSPRS.GrbF00 .........OK Comparing GFSPRS.GrbF24 .........OK +<<<<<<< HEAD + + 0: The total amount of wall time = 328.780080 + 0: The maximum resident set size (KB) = 533460 + +Test 007 control_csawmg PASS + + +REGRESSION TEST WAS SUCCESSFUL +Mon May 16 20:00:40 UTC 2022 +Elapsed time: 00h:20m:03s. Have a nice day! +======= Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK Comparing RESTART/coupler.res .........OK Comparing RESTART/fv_core.res.nc .........OK @@ -3203,5 +3372,11 @@ Test 125 atmaero_control_p8 PASS REGRESSION TEST WAS SUCCESSFUL +<<<<<<< HEAD +Tue May 31 19:30:16 UTC 2022 +Elapsed time: 01h:01m:27s. Have a nice day! +>>>>>>> upstream/develop +======= Thu Jun 2 18:26:24 UTC 2022 Elapsed time: 01h:08m:26s. Have a nice day! +>>>>>>> upstream/develop