Merge branch 'develop' into mynn_01March_gjf

haiqinli · Mar 21, 2023 · 4af6f97 · 4af6f97
2 parents ffdabe0 + 10ceadd
commit 4af6f97
Show file tree

Hide file tree

Showing 14 changed files with 5,009 additions and 5,075 deletions.
diff --git a/AQM b/AQM
diff --git a/FV3 b/FV3
diff --git a/tests/RegressionTests_acorn.intel.log b/tests/RegressionTests_acorn.intel.log
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
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_wcoss2.intel.log b/tests/RegressionTests_wcoss2.intel.log
diff --git a/tests/parm/aqm/aqm.rc b/tests/parm/aqm/aqm.rc
@@ -16,7 +16,7 @@ csqy_data:   CSQY_DATA_cb6r3_ae6_aq
 optics_data: PHOT_OPTICS.dat
 omi_data:    omi_cmaq_2015_361X179.dat
 
-init_concentrations: true
+init_concentrations: false
 
 run_aerosol: true
 

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -40,7 +40,7 @@ RUN     | cpld_warmstart_c48
 RUN     | cpld_restart_c48                                                                                                        |                                         |     | cpld_warmstart_c48
 
 COMPILE | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8,FV3_GFS_cpld_rasmgshocnsstnoahmp_ugwp -DFASTER=ON                      |                                         | fv3 |
-RUN     | cpld_control_p8_faster                                                                                                  |                                         | fv3 |
+RUN     | cpld_control_p8_faster                                                                                                  | - cheyenne.intel                        | fv3 |
 
 ###################################################################################################################################################################################
 # ATM tests                                                                                                                                                                       #
@@ -283,10 +283,10 @@ RUN     | atmaero_control_p8_rad_micro
 # ATM-CMAQ tests
 ###################################################################################################################################################################################
 
-COMPILE | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2                                                                               |                                           | fv3 |
+COMPILE | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -D32BIT=ON                                                                    |                                           | fv3 |
 RUN     | regional_atmaq                                                                                                        |                                           | fv3 |
-COMPILE | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -DDEBUG=ON                                                                    |                                           | fv3 |
+COMPILE | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -DDEBUG=ON -D32BIT=ON                                                         |                                           | fv3 |
 RUN     | regional_atmaq_debug                                                                                                  | - jet.intel gaea.intel cheyenne.intel     | fv3 |
 
-COMPILE | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -DFASTER=ON                                                                   |                                           | fv3 |
+COMPILE | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -DFASTER=ON -D32BIT=ON                                                        |                                           | fv3 |
 RUN     | regional_atmaq_faster                                                                                                 |                                           | fv3 |
diff --git a/tests/rt.sh b/tests/rt.sh
@@ -446,7 +446,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
 fi
 
 
-BL_DATE=20230308
+BL_DATE=20230320
 
 RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
+2 −2		aqm_files.cmake
+0 −894		src/model/src/aero_depv.F
+25 −33		src/model/src/vdiffacmx.F
+13 −0		ccpp/data/GFS_typedefs.F90
+26 −5		ccpp/data/GFS_typedefs.meta
+1 −1		ccpp/framework
+1 −1		ccpp/physics
-Original file line number
+Diff line change
@@ Expand Up @@
     fi
-    BL_DATE=20230308
+    BL_DATE=20230320
     RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
@@ Expand Down @@