Bring hotfixes for ccpp-framework and ccpp-physics from release/publi…

…c-v4 back to master (#120) * Bugfixes for CCPP: check for and correct syntax of \htmlinclude lines * Fix formatting (tabs, whitespaces) in tests/rt.conf
NOAA-GSL · May 11, 2020 · 237388e · 237388e
1 parent 95fcb7c
commit 237388e
Show file tree

Hide file tree

Showing 10 changed files with 9,959 additions and 10,324 deletions.
diff --git a/FV3 b/FV3
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_cray.log b/tests/Compile_wcoss_cray.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
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/rt.conf b/tests/rt.conf
@@ -19,7 +19,7 @@ RUN     | fv3_ccpp_stochy
 RUN     | fv3_ccpp_iau                                                                                                                   | standard    | wcoss_cray     | fv3         |
 RUN     | fv3_ccpp_iau                                                                                                                   | standard    | wcoss_dell_p3  | fv3         |
 RUN     | fv3_ccpp_iau                                                                                                                   | standard    | hera.intel     | fv3         |
-RUN	| fv3_ccpp_ca															 | standard    | hera.intel     | fv3         |
+RUN     | fv3_ccpp_ca                                                                                                                    | standard    | hera.intel     | fv3         |
 # temporarily disabled for gaea.intel (intel18): gives different results when creating baseline and verifying against it
 #RUN     | fv3_ccpp_iau                                                                                                                   | standard    | gaea.intel     | fv3         |
 RUN     | fv3_ccpp_iau                                                                                                                   | standard    | jet.intel      | fv3         |
@@ -81,11 +81,11 @@ RUN     | fv3_ccpp_gfdlmp
 RUN     | fv3_ccpp_gfdlmprad_gwd                                                                                                         | standard    |                | fv3         |
 RUN     | fv3_ccpp_gfdlmprad_noahmp                                                                                                      | standard    |                | fv3         |
 
-COMPILE | CCPP=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf,FV3_GFS_2017_satmedmfq                | standard    | wcoss_cray     | fv3         |
-COMPILE | CCPP=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf,FV3_GFS_2017_satmedmfq                | standard    | wcoss_dell_p3  | fv3         |
-COMPILE | CCPP=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf,FV3_GFS_2017_satmedmfq                | standard    | hera.intel     | fv3         |
-COMPILE | CCPP=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf,FV3_GFS_2017_satmedmfq                | standard    | gaea.intel     | fv3         |
-COMPILE | CCPP=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf,FV3_GFS_2017_satmedmfq                | standard    | jet.intel      | fv3         |
+COMPILE | CCPP=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf,FV3_GFS_2017_satmedmfq                         | standard    | wcoss_cray     | fv3         |
+COMPILE | CCPP=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf,FV3_GFS_2017_satmedmfq                         | standard    | wcoss_dell_p3  | fv3         |
+COMPILE | CCPP=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf,FV3_GFS_2017_satmedmfq                         | standard    | hera.intel     | fv3         |
+COMPILE | CCPP=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf,FV3_GFS_2017_satmedmfq                         | standard    | gaea.intel     | fv3         |
+COMPILE | CCPP=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf,FV3_GFS_2017_satmedmfq                         | standard    | jet.intel      | fv3         |
 #RUN     | fv3_ccpp_csawmgshoc                                                                                                            | standard    |                | fv3         |
 #RUN     | fv3_ccpp_csawmg3shoc127                                                                                                        | standard    |                | fv3         |
 RUN     | fv3_ccpp_csawmg                                                                                                                | standard    |                | fv3         |
+1 −1		ccpp/framework
+1 −1		ccpp/physics
+1 −1		ccpp/suites/suite_FV3_CPT_v0.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_RRTMGP.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_coupled.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_csawmg.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_csawmgshoc.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_gfdlmp.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_gfdlmp_noahmp.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional_c768.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_h2ophys.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_myj.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_ntiedtke.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_ozphys_2015.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_sas.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_satmedmf.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_satmedmf_coupled.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_satmedmfq.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_shinhong.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_stretched.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_ysu.xml
+1 −1		ccpp/suites/suite_FV3_GFS_cpld_rasmgshoc.xml
+1 −1		ccpp/suites/suite_FV3_GFS_cpldnst_rasmgshoc.xml
+1 −1		ccpp/suites/suite_FV3_GFS_rasmgshoc.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v15.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v15_gf.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v15_gf_thompson.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v15_mynn.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v15_ras.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v15_rasmgshoc.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v15_thompson.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v15_thompson_mynn.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v15p2.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v15p2_coupled.xml
+91 −0		ccpp/suites/suite_FV3_GFS_v15p2_no_nsst.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v15plus.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v15plusras.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v16_csawmg.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v16beta.xml
+91 −0		ccpp/suites/suite_FV3_GFS_v16beta_no_nsst.xml
+1 −1		ccpp/suites/suite_FV3_GSD_SAR.xml
+1 −1		ccpp/suites/suite_FV3_GSD_noah.xml
+1 −1		ccpp/suites/suite_FV3_GSD_v0.xml
+1 −1		ccpp/suites/suite_FV3_GSD_v0_drag_suite.xml
+1 −1		ccpp/suites/suite_FV3_HAFS_ferhires_update_moist.xml
+1 −1		gfsphysics/GFS_layer/GFS_physics_driver.F90