ufs-community · DusanJovic-NOAA · Dec 28, 2021 · Dec 16, 2021 · Dec 17, 2021 · Dec 27, 2021
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  url = https://github.com/mzhangw/fv3atm
+  branch = revert_iovr4
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3

diff --git a/FV3 b/FV3
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.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/fv3_conf/c96_HAFS_v0_hwrf_run.IN b/tests/fv3_conf/c96_HAFS_v0_hwrf_run.IN
diff --git a/tests/fv3_conf/esg_HAFS_v0_hwrf_run.IN b/tests/fv3_conf/esg_HAFS_v0_hwrf_run.IN
diff --git a/tests/parm/c96_HAFS_v0_hwrf.nml.IN b/tests/parm/c96_HAFS_v0_hwrf.nml.IN
diff --git a/tests/parm/esg_HAFS_v0_hwrf-model_configure.IN b/tests/parm/esg_HAFS_v0_hwrf-model_configure.IN
diff --git a/tests/parm/esg_HAFS_v0_hwrf.nml.IN b/tests/parm/esg_HAFS_v0_hwrf.nml.IN
diff --git a/tests/rt.conf b/tests/rt.conf
@@ -78,7 +78,7 @@ RUN     | rap_sfcdiff_restart
 RUN     | hrrr_control                                                                                                            |                                         | fv3 |
 RUN     | rrfs_v1beta                                                                                                             |                                         | fv3 |
 
-COMPILE | -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,FV3_HAFS_v0_hwrf_thompson | | fv3 |
+COMPILE | -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 | | fv3 |
 # fv3_gfs_v15p2 and fv3_gfs_v15p2_RRTMGP fail w/ sat.vap pressure error when cdmbgwd=0.14,1.8,1.0,1.0
 RUN     | control_rrtmgp                                                                                                          |                                         | fv3 |
 #RUN     | control_rrtmgp_2threads                                                                                                 |                                         |     |
@@ -91,9 +91,6 @@ RUN     | control_ras
 RUN     | control_thompson                                                                                                        | - wcoss_cray                            | fv3 |
 RUN     | control_thompson_no_aero                                                                                                | - wcoss_cray                            | fv3 |
 
-RUN     | fv3_HAFS_v0_hwrf_thompson                                                                                               |                                         | fv3 |
-RUN     | fv3_esg_HAFS_v0_hwrf_thompson                                                                                           |                                         | fv3 |
-
 # Run WAM test in REPRO mode to avoid numerical instability in the deep atmosphere
 COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DREPRO=ON                                       |                                         | fv3 |
 RUN     | control_wam                                                                                                             |                                         | fv3 |
@@ -138,10 +135,6 @@ RUN     | rap_flake_debug
 RUN     | rap_noah_sfcdiff_cires_ugwp_debug                                                                                       |                                         | fv3 |
 RUN     | rrfs_v1beta_debug                                                                                                       |                                         | fv3 |
 
-COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_HAFS_v0_hwrf_thompson -DDEBUG=ON                                                            |                                         | fv3 |
-RUN     | fv3_HAFS_v0_hwrf_thompson_debug                                                                                         |                                         | fv3 |
-RUN     | fv3_esg_HAFS_v0_hwrf_thompson_debug                                                                                     | -cheyenne.intel                         | fv3 |
-
 ###################################################################################################################################################################################
 # HAFS tests                                                                                                                                                                      #
 ###################################################################################################################################################################################

diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
@@ -2,7 +2,7 @@
 # CCPP PROD tests                                                                                                                                                #
 ##################################################################################################################################################################
 
-COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v16_RRTMGP,FV3_GFS_v16_thompson,FV3_GFS_v16_ras,FV3_HAFS_v0_hwrf_thompson,FV3_GFS_v16_nsstNoahmpUGWPv1 | | fv3 |
+COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v16_RRTMGP,FV3_GFS_v16_thompson,FV3_GFS_v16_ras,FV3_GFS_v16_nsstNoahmpUGWPv1 | | fv3 |
 
 RUN     | control                                                                                                                 |                | fv3         |
 RUN     | control_restart                                                                                                         |                |             | control
@@ -15,9 +15,6 @@ RUN     | control_thompson_no_aero
 RUN     | control_ras                                                                                                             |                | fv3         |
 RUN     | control_p7                                                                                                              |                | fv3         |
 
-RUN     | fv3_HAFS_v0_hwrf_thompson                                                                                               |                | fv3         |
-RUN     | fv3_esg_HAFS_v0_hwrf_thompson                                                                                           |                | fv3         |
-
 COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta -D32BIT=ON                                     |                | fv3         |
 
 RUN     | rap_control                                                                                                             |                | fv3         |
@@ -58,10 +55,6 @@ RUN     | control_ras_debug
 RUN     | control_stochy_debug                                                                                                    |                | fv3         |
 RUN     | control_debug_p7                                                                                                        |                | fv3         |
 
-COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_HAFS_v0_hwrf_thompson -DDEBUG=ON                                                            |                | fv3         |
-RUN     | fv3_HAFS_v0_hwrf_thompson_debug                                                                                         |                | fv3         |
-RUN     | fv3_esg_HAFS_v0_hwrf_thompson_debug                                                                                     |                | fv3         |
-
 #COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_2017_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON                                      |                | fv3         |
 #RUN     | fv3_multigases_debug                                                                                                    |                | fv3         |
 

diff --git a/tests/tests/fv3_HAFS_v0_hwrf_thompson b/tests/tests/fv3_HAFS_v0_hwrf_thompson
diff --git a/tests/tests/fv3_HAFS_v0_hwrf_thompson_debug b/tests/tests/fv3_HAFS_v0_hwrf_thompson_debug
diff --git a/tests/tests/fv3_esg_HAFS_v0_hwrf_thompson b/tests/tests/fv3_esg_HAFS_v0_hwrf_thompson
diff --git a/tests/tests/fv3_esg_HAFS_v0_hwrf_thompson_debug b/tests/tests/fv3_esg_HAFS_v0_hwrf_thompson_debug
+2 −2		.gitmodules
+1 −1		ccpp/physics
+0 −93		ccpp/suites/suite_FV3_HAFS_v0_hwrf_thompson.xml