Merge branch 'develop' of https://github.com/ufs-community/ufs-s2s-model

into develop
binli2337 · Oct 9, 2020 · 5ffd924 · 5ffd924
2 parents 8dda8c5 + 973fd67
commit 5ffd924
Show file tree

Hide file tree

Showing 21 changed files with 13,146 additions and 12,684 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -4,18 +4,27 @@
 
 Issues Fixed (include github issue #):
 
-Are changes expected to change answers?
-- bit for bit (yes/no)
-- more substantial (yes/no)
-
-Specific changes:
-- changes in parm directory (yes/no)
-- changes in module files (yes/no)
-- new tests added or removed (yes/no)
-
-Testing performed:
-- machines:
-- details:
+Do answers change?
+ - [ ] No. Answers are the same as previous baselines when using cmp or nccmp
+ - [ ] Yes. New baselines are required.
+
+Are there changes in parm or module directory?
+- [ ] No
+- [ ] Yes.  Provide details below
+
+Are new tests added or removed?
+- [ ] No
+- [ ] Yes.  Provide details below
+
+Regression tests run or created on these platforms:
+
+- [ ] Hera
+- [ ] Orion
+- [ ] Dell-p3
+
+Additional Testing details (failed tests etc):
+
+Dependent or Associated PRs, if any:
 
 Hashes used for testing:
 - NEMS:

diff --git a/tests/Compile_hera.intel.log b/tests/Compile_hera.intel.log
diff --git a/tests/Compile_orion.intel.log b/tests/Compile_orion.intel.log
diff --git a/tests/Compile_wcoss_dell_p3.log b/tests/Compile_wcoss_dell_p3.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
@@ -1,10 +1,10 @@
-Wed Sep 30 12:55:57 UTC 2020
+Thu Oct  8 22:27:29 UTC 2020
 Start Regression test
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_1stepcold_ccpp_cmeps
 mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_1stepcold_ccpp_cmeps/RESTART
-working dir  = /scratch2/NCEPDEV/stmp3/Bin.Li/S2S_RT/rt_231900/cpld_fv3_ccpp_mom6_cice_cmeps_1stepcold_atm_flux
+working dir  = /scratch2/BMC/gsd-fv3-dev/Shan.Sun/S2S_RT/rt_243538/cpld_fv3_ccpp_mom6_cice_cmeps_1stepcold_atm_flux
 Checking test 001 cpld_fv3_ccpp_mom6_cice_cmeps_1stepcold_atm_flux results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -55,13 +55,12 @@ Checking test 001 cpld_fv3_ccpp_mom6_cice_cmeps_1stepcold_atm_flux results ....
  Comparing RESTART/MOM.res_2.nc .........OK
  Comparing RESTART/MOM.res_3.nc .........OK
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
- Comparing ufs.s2s.cpl.r.2016-10-05-00000.nc .........OK
 Test 001 cpld_fv3_ccpp_mom6_cice_cmeps_1stepcold_atm_flux PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_2d_warm_ccpp_cmeps
 mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_2d_warm_ccpp_cmeps/RESTART
-working dir  = /scratch2/NCEPDEV/stmp3/Bin.Li/S2S_RT/rt_231900/cpld_fv3_ccpp_mom6_cice_cmeps_2d_atm_flux
+working dir  = /scratch2/BMC/gsd-fv3-dev/Shan.Sun/S2S_RT/rt_243538/cpld_fv3_ccpp_mom6_cice_cmeps_2d_atm_flux
 Checking test 002 cpld_fv3_ccpp_mom6_cice_cmeps_2d_atm_flux results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -112,13 +111,12 @@ Checking test 002 cpld_fv3_ccpp_mom6_cice_cmeps_2d_atm_flux results ....
  Comparing RESTART/MOM.res_2.nc .........OK
  Comparing RESTART/MOM.res_3.nc .........OK
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
- Comparing ufs.s2s.cpl.r.2016-10-05-00000.nc .........OK
 Test 002 cpld_fv3_ccpp_mom6_cice_cmeps_2d_atm_flux PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_3d_warm_ccpp_cmeps
 mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_3d_warm_ccpp_cmeps/RESTART
-working dir  = /scratch2/NCEPDEV/stmp3/Bin.Li/S2S_RT/rt_231900/cpld_fv3_ccpp_mom6_cice_cmeps_3d_atm_flux
+working dir  = /scratch2/BMC/gsd-fv3-dev/Shan.Sun/S2S_RT/rt_243538/cpld_fv3_ccpp_mom6_cice_cmeps_3d_atm_flux
 Checking test 003 cpld_fv3_ccpp_mom6_cice_cmeps_3d_atm_flux results ....
  Comparing phyf072.tile1.nc .........OK
  Comparing phyf072.tile2.nc .........OK
@@ -169,13 +167,12 @@ Checking test 003 cpld_fv3_ccpp_mom6_cice_cmeps_3d_atm_flux results ....
  Comparing RESTART/MOM.res_2.nc .........OK
  Comparing RESTART/MOM.res_3.nc .........OK
  Comparing RESTART/iced.2016-10-06-00000.nc .........OK
- Comparing ufs.s2s.cpl.r.2016-10-06-00000.nc .........OK
 Test 003 cpld_fv3_ccpp_mom6_cice_cmeps_3d_atm_flux PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_3d_warm_ccpp_cmeps
 mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_3d_warm_ccpp_cmeps/RESTART
-working dir  = /scratch2/NCEPDEV/stmp3/Bin.Li/S2S_RT/rt_231900/cpld_fv3_ccpp_mom6_cice_cmeps_restart
+working dir  = /scratch2/BMC/gsd-fv3-dev/Shan.Sun/S2S_RT/rt_243538/cpld_fv3_ccpp_mom6_cice_cmeps_restart
 Checking test 004 cpld_fv3_ccpp_mom6_cice_cmeps_restart results ....
  Comparing phyf072.tile1.nc .........OK
  Comparing phyf072.tile2.nc .........OK
@@ -226,13 +223,12 @@ Checking test 004 cpld_fv3_ccpp_mom6_cice_cmeps_restart results ....
  Comparing RESTART/MOM.res_2.nc .........OK
  Comparing RESTART/MOM.res_3.nc .........OK
  Comparing RESTART/iced.2016-10-06-00000.nc .........OK
- Comparing ufs.s2s.cpl.r.2016-10-06-00000.nc .........OK
 Test 004 cpld_fv3_ccpp_mom6_cice_cmeps_restart PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_2d_warm_ccpp_cmeps
 mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_2d_warm_ccpp_cmeps/RESTART
-working dir  = /scratch2/NCEPDEV/stmp3/Bin.Li/S2S_RT/rt_231900/cpld_fv3_ccpp_mom6_cice_cmeps_2d_2threads
+working dir  = /scratch2/BMC/gsd-fv3-dev/Shan.Sun/S2S_RT/rt_243538/cpld_fv3_ccpp_mom6_cice_cmeps_2d_2threads
 Checking test 005 cpld_fv3_ccpp_mom6_cice_cmeps_2d_2threads results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -283,13 +279,12 @@ Checking test 005 cpld_fv3_ccpp_mom6_cice_cmeps_2d_2threads results ....
  Comparing RESTART/MOM.res_2.nc .........OK
  Comparing RESTART/MOM.res_3.nc .........OK
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
- Comparing ufs.s2s.cpl.r.2016-10-05-00000.nc .........OK
 Test 005 cpld_fv3_ccpp_mom6_cice_cmeps_2d_2threads PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_2d_warm_ccpp_cmeps
 mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_2d_warm_ccpp_cmeps/RESTART
-working dir  = /scratch2/NCEPDEV/stmp3/Bin.Li/S2S_RT/rt_231900/cpld_fv3_ccpp_mom6_cice_cmeps_2d_decomp
+working dir  = /scratch2/BMC/gsd-fv3-dev/Shan.Sun/S2S_RT/rt_243538/cpld_fv3_ccpp_mom6_cice_cmeps_2d_decomp
 Checking test 006 cpld_fv3_ccpp_mom6_cice_cmeps_2d_decomp results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -340,13 +335,12 @@ Checking test 006 cpld_fv3_ccpp_mom6_cice_cmeps_2d_decomp results ....
  Comparing RESTART/MOM.res_2.nc .........OK
  Comparing RESTART/MOM.res_3.nc .........OK
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
- Comparing ufs.s2s.cpl.r.2016-10-05-00000.nc .........OK
 Test 006 cpld_fv3_ccpp_mom6_cice_cmeps_2d_decomp PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_1d_warm_satmedmf_ccpp_cmeps
 mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_1d_warm_satmedmf_ccpp_cmeps/RESTART
-working dir  = /scratch2/NCEPDEV/stmp3/Bin.Li/S2S_RT/rt_231900/cpld_fv3_ccpp_mom6_cice_cmeps_1d_satmedmf
+working dir  = /scratch2/BMC/gsd-fv3-dev/Shan.Sun/S2S_RT/rt_243538/cpld_fv3_ccpp_mom6_cice_cmeps_1d_satmedmf
 Checking test 007 cpld_fv3_ccpp_mom6_cice_cmeps_1d_satmedmf results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -397,13 +391,12 @@ Checking test 007 cpld_fv3_ccpp_mom6_cice_cmeps_1d_satmedmf results ....
  Comparing RESTART/MOM.res_2.nc .........OK
  Comparing RESTART/MOM.res_3.nc .........OK
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
- Comparing ufs.s2s.cpl.r.2016-10-04-00000.nc .........OK
 Test 007 cpld_fv3_ccpp_mom6_cice_cmeps_1d_satmedmf PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_2d_warm_ccpp384_cmeps
 mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_2d_warm_ccpp384_cmeps/RESTART
-working dir  = /scratch2/NCEPDEV/stmp3/Bin.Li/S2S_RT/rt_231900/cpld_fv3_ccpp_384_mom6_cice_cmeps_2d_atm_flux
+working dir  = /scratch2/BMC/gsd-fv3-dev/Shan.Sun/S2S_RT/rt_243538/cpld_fv3_ccpp_384_mom6_cice_cmeps_2d_atm_flux
 Checking test 008 cpld_fv3_ccpp_384_mom6_cice_cmeps_2d_atm_flux results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -454,14 +447,69 @@ Checking test 008 cpld_fv3_ccpp_384_mom6_cice_cmeps_2d_atm_flux results ....
  Comparing RESTART/MOM.res_2.nc .........OK
  Comparing RESTART/MOM.res_3.nc .........OK
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
- Comparing ufs.s2s.cpl.r.2016-10-05-00000.nc .........OK
 Test 008 cpld_fv3_ccpp_384_mom6_cice_cmeps_2d_atm_flux PASS
 
 
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_2d_warm_ccpp384_cmeps_frac
+mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_2d_warm_ccpp384_cmeps_frac/RESTART
+working dir  = /scratch2/BMC/gsd-fv3-dev/Shan.Sun/S2S_RT/rt_243538/cpld_fv3_ccpp_384_mom6_cice_cmeps_2d_atm_flux_frac
+Checking test 009 cpld_fv3_ccpp_384_mom6_cice_cmeps_2d_atm_flux_frac results ....
+ Comparing phyf048.tile1.nc .........OK
+ Comparing phyf048.tile2.nc .........OK
+ Comparing phyf048.tile3.nc .........OK
+ Comparing phyf048.tile4.nc .........OK
+ Comparing phyf048.tile5.nc .........OK
+ Comparing phyf048.tile6.nc .........OK
+ Comparing dynf048.tile1.nc .........OK
+ Comparing dynf048.tile2.nc .........OK
+ Comparing dynf048.tile3.nc .........OK
+ Comparing dynf048.tile4.nc .........OK
+ Comparing dynf048.tile5.nc .........OK
+ Comparing dynf048.tile6.nc .........OK
+ Comparing RESTART/coupler.res .........OK
+ Comparing RESTART/fv_core.res.nc .........OK
+ Comparing RESTART/fv_core.res.tile1.nc .........OK
+ Comparing RESTART/fv_core.res.tile2.nc .........OK
+ Comparing RESTART/fv_core.res.tile3.nc .........OK
+ Comparing RESTART/fv_core.res.tile4.nc .........OK
+ Comparing RESTART/fv_core.res.tile5.nc .........OK
+ Comparing RESTART/fv_core.res.tile6.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
+ Comparing RESTART/sfc_data.tile1.nc .........OK
+ Comparing RESTART/sfc_data.tile2.nc .........OK
+ Comparing RESTART/sfc_data.tile3.nc .........OK
+ Comparing RESTART/sfc_data.tile4.nc .........OK
+ Comparing RESTART/sfc_data.tile5.nc .........OK
+ Comparing RESTART/sfc_data.tile6.nc .........OK
+ Comparing RESTART/MOM.res.nc .........OK
+ Comparing RESTART/MOM.res_1.nc .........OK
+ Comparing RESTART/MOM.res_2.nc .........OK
+ Comparing RESTART/MOM.res_3.nc .........OK
+ Comparing RESTART/iced.2016-10-05-00000.nc .........OK
+Test 009 cpld_fv3_ccpp_384_mom6_cice_cmeps_2d_atm_flux_frac PASS
+
+
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_1d_bmrt_ccpp_cmeps
 mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_1d_bmrt_ccpp_cmeps/RESTART
-working dir  = /scratch2/NCEPDEV/stmp3/Bin.Li/S2S_RT/rt_231900/cpld_fv3_ccpp_384_mom6_cice_cmeps_1d_bmark_rt
-Checking test 009 cpld_fv3_ccpp_384_mom6_cice_cmeps_1d_bmark_rt results ....
+working dir  = /scratch2/BMC/gsd-fv3-dev/Shan.Sun/S2S_RT/rt_243538/cpld_fv3_ccpp_384_mom6_cice_cmeps_1d_bmark_rt
+Checking test 010 cpld_fv3_ccpp_384_mom6_cice_cmeps_1d_bmark_rt results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -548,15 +596,13 @@ Checking test 009 cpld_fv3_ccpp_384_mom6_cice_cmeps_1d_bmark_rt results ....
  Comparing RESTART/MOM.res.2013-04-01-12-00-00_3.nc .........OK
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/iced.2013-04-01-43200.nc .........OK
- Comparing ufs.s2s.cpl.r.2013-04-01-43200.nc .........OK
- Comparing ufs.s2s.cpl.r.2013-04-02-00000.nc .........OK
-Test 009 cpld_fv3_ccpp_384_mom6_cice_cmeps_1d_bmark_rt PASS
+Test 010 cpld_fv3_ccpp_384_mom6_cice_cmeps_1d_bmark_rt PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_1d_bmwav_ccpp_cmeps
 mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_1d_bmwav_ccpp_cmeps/RESTART
-working dir  = /scratch2/NCEPDEV/stmp3/Bin.Li/S2S_RT/rt_231900/cpld_fv3_ccpp_384_mom6_cice_cmeps_ww3_1d_bmark_rt
-Checking test 010 cpld_fv3_ccpp_384_mom6_cice_cmeps_ww3_1d_bmark_rt results ....
+working dir  = /scratch2/BMC/gsd-fv3-dev/Shan.Sun/S2S_RT/rt_243538/cpld_fv3_ccpp_384_mom6_cice_cmeps_ww3_1d_bmark_rt
+Checking test 011 cpld_fv3_ccpp_384_mom6_cice_cmeps_ww3_1d_bmark_rt results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -609,14 +655,13 @@ Checking test 010 cpld_fv3_ccpp_384_mom6_cice_cmeps_ww3_1d_bmark_rt results ....
  Comparing RESTART/MOM.res_2.nc .........OK
  Comparing RESTART/MOM.res_3.nc .........OK
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
- Comparing ufs.s2s.cpl.r.2013-04-02-00000.nc .........OK
-Test 010 cpld_fv3_ccpp_384_mom6_cice_cmeps_ww3_1d_bmark_rt PASS
+Test 011 cpld_fv3_ccpp_384_mom6_cice_cmeps_ww3_1d_bmark_rt PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_6h_warm_debug_ccpp_cmeps
 mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200928/RT-Baselines_6h_warm_debug_ccpp_cmeps/RESTART
-working dir  = /scratch2/NCEPDEV/stmp3/Bin.Li/S2S_RT/rt_231900/cpld_fv3_ccpp_mom6_cice_cmeps_6h_debug
-Checking test 011 cpld_fv3_ccpp_mom6_cice_cmeps_6h_debug results ....
+working dir  = /scratch2/BMC/gsd-fv3-dev/Shan.Sun/S2S_RT/rt_243538/cpld_fv3_ccpp_mom6_cice_cmeps_6h_debug
+Checking test 012 cpld_fv3_ccpp_mom6_cice_cmeps_6h_debug results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
  Comparing phyf006.tile3.nc .........OK
@@ -667,9 +712,9 @@ Checking test 011 cpld_fv3_ccpp_mom6_cice_cmeps_6h_debug results ....
  Comparing RESTART/MOM.res_3.nc .........OK
  Comparing RESTART/iced.2016-10-03-21600.nc .........OK
  Comparing ufs.s2s.cpl.r.2016-10-03-21600.nc .........OK
-Test 011 cpld_fv3_ccpp_mom6_cice_cmeps_6h_debug PASS
+Test 012 cpld_fv3_ccpp_mom6_cice_cmeps_6h_debug PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Wed Sep 30 17:51:35 UTC 2020
-Elapsed time: 04h:55m:42s. Have a nice day!
+Fri Oct  9 04:00:48 UTC 2020
+Elapsed time: 05h:33m:21s. Have a nice day!