Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…

…r-model into feature/split_gfs_typedefs_rename_ccpp_interstitial
ufs-community · Apr 11, 2022 · dc814db · dc814db
2 parents 29f7d46 + c2e6b22
commit dc814db
Show file tree

Hide file tree

Showing 47 changed files with 6,213 additions and 5,370 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -62,6 +62,7 @@ set(DEBUG           OFF CACHE BOOL "Enable DEBUG mode")
 set(DEBUG_LINKMPI   ON  CACHE BOOL "Enable linkmpi option when DEBUG mode is on")
 set(INLINE_POST     OFF CACHE BOOL "Enable inline post")
 set(MULTI_GASES     OFF CACHE BOOL "Enable MULTI_GASES")
+set(MOVING_NEST     OFF CACHE BOOL "Enable moving nest code")
 set(OPENMP          ON  CACHE BOOL "Enable OpenMP threading")
 set(PARALLEL_NETCDF OFF CACHE BOOL "Enable parallel NetCDF")
 set(REPRO           OFF CACHE BOOL "Enable REPRO mode")
@@ -86,6 +87,7 @@ message("DEBUG ............ ${DEBUG}")
 message("DEBUG_LINKMPI .... ${DEBUG_LINKMPI}")
 message("INLINE_POST ...... ${INLINE_POST}")
 message("MULTI_GASES ...... ${MULTI_GASES}")
+message("MOVING_NEST ...... ${MOVING_NEST}")
 message("OPENMP ........... ${OPENMP}")
 message("PARALLEL_NETCDF .. ${PARALLEL_NETCDF}")
 message("REPRO ............ ${REPRO}")

diff --git a/FV3 b/FV3
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_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/default_vars.sh b/tests/default_vars.sh
@@ -1563,6 +1563,13 @@ export JNPES=$JNPES_dflt
 export TASKS=$TASKS_dflt
 export TPN=$TPN_dflt
 
+export IS_MOVING_NEST=".false."
+export VORTEX_TRACKER=0
+export NTRACK=0
+export MOVE_CD_X=0
+export MOVE_CD_Y=0
+export CPL_IMP_MRG=.true.
+
 export OUTPUT_GRID=''
 export IMO=''
 export JMO=''

diff --git a/tests/fv3_conf/hafs_fv3_run.IN b/tests/fv3_conf/hafs_fv3_run.IN
@@ -13,10 +13,16 @@ if [ ${CNTL_DIR} = "hafs_regional_atm" ] || \
    [ ${CNTL_DIR} = "hafs_regional_docn" ] || \
    [ ${CNTL_DIR} = "hafs_regional_docn_oisst" ]; then
   cp -r @[INPUTDATA_ROOT]/FV3_hafs_input_data/INPUT_hafs_regional_atm/* ./INPUT/
+elif [ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm" ] || \
+     [ ${CNTL_DIR} = "hafs_regional_specified_moving_1nest_atm" ] || \
+     [ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn" ] || \
+     [ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav" ]; then
+  cp -r @[INPUTDATA_ROOT]/FV3_hafs_input_data/INPUT_hafs_regional_storm_following_1nest_atm/* ./INPUT/
 elif [ ${CNTL_DIR} = "hafs_regional_1nest_atm" ] || \
-   [ ${CNTL_DIR} = "hafs_regional_telescopic_2nests_atm" ] || \
-   [ ${CNTL_DIR} = "hafs_global_1nest_atm" ] || \
-   [ ${CNTL_DIR} = "hafs_global_multiple_4nests_atm" ]; then
+     [ ${CNTL_DIR} = "hafs_regional_telescopic_2nests_atm" ] || \
+     [ ${CNTL_DIR} = "hafs_global_1nest_atm" ] || \
+     [ ${CNTL_DIR} = "hafs_global_multiple_4nests_atm" ] || \
+     [ ${CNTL_DIR} = "hafs_global_storm_following_1nest_atm" ]; then
   cp -r @[INPUTDATA_ROOT]/FV3_hafs_input_data/INPUT_${CNTL_DIR}/* ./INPUT/
 else
   echo "Error: unsupported experiments ${CNTL_DIR}"
@@ -28,3 +34,10 @@ if [ ${CNTL_DIR} = "hafs_regional_atm_thompson_gfdlsf" ]; then
   cp @[INPUTDATA_ROOT]/FV3_input_data_gsd/freezeH2O.dat .
   cp @[INPUTDATA_ROOT]/FV3_input_data_gsd/CCN_ACTIVATE.BIN .
 fi
+
+if [[ $POSTAPP = 'hafs' ]]; then
+    cp ${PATHRT}/parm/post_itag_hafs itag
+    cp ${PATHRT}/parm/postxconfig-NT-hafs.txt postxconfig-NT.txt
+    cp ${PATHRT}/parm/postxconfig-NT-hafs.txt postxconfig-NT_FH00.txt
+    cp ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
+fi
diff --git a/tests/fv3_conf/hafs_ww3_run.IN b/tests/fv3_conf/hafs_ww3_run.IN
@@ -1,9 +1,14 @@
 
 if [ ${CNTL_DIR} = "hafs_regional_atm_wav" ] || \
-   [ ${CNTL_DIR} = "hafs_regional_atm_ocn_wav" ]; then
+   [ ${CNTL_DIR} = "hafs_regional_atm_ocn_wav" ] || \
+   [ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav" ]; then
   cp @[INPUTDATA_ROOT_WW3]/mod_def.natl_6m ./mod_def.ww3
   cp @[INPUTDATA_ROOT_WW3]/mod_def.points ./mod_def.points
-  cp @[INPUTDATA_ROOT_WW3]/wind.natl_6m ./wind.ww3
+  if [ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav" ]; then
+    cp @[INPUTDATA_ROOT]/FV3_hafs_input_data/WW3_hafs_regional_input_data/wind.natl_6m_2020082512 ./wind.ww3
+  else
+    cp @[INPUTDATA_ROOT_WW3]/wind.natl_6m ./wind.ww3
+  fi
   # Currently, provide a non-existing symbolic link for nest.ww3
   ln -sf @[INPUTDATA_ROOT_WW3]/nest.ww3 ./
 else

diff --git a/tests/fv3_conf/hycom_hat10_run.IN b/tests/fv3_conf/hycom_hat10_run.IN
@@ -1,2 +1,7 @@
 
-rsync -arv @[INPUTDATA_ROOT]/HYCOM_regional_input_data/. ./
+if [ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn" ] || \
+   [ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav" ]; then
+  rsync -arv @[INPUTDATA_ROOT]/FV3_hafs_input_data/HYCOM_hafs_regional_input_data/. ./
+else
+  rsync -arv @[INPUTDATA_ROOT]/HYCOM_regional_input_data/. ./
+fi
diff --git a/tests/fv3_conf/regional_run.IN b/tests/fv3_conf/regional_run.IN
@@ -24,11 +24,6 @@ if [[ $POSTAPP = 'lam' ]]; then
     cp ${PATHRT}/parm/postxconfig-NT-fv3lam.txt postxconfig-NT.txt
     cp ${PATHRT}/parm/postxconfig-NT-fv3lam.txt postxconfig-NT_FH00.txt
     cp ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
-elif [[ $POSTAPP = 'hafs' ]]; then
-    cp ${PATHRT}/parm/post_itag_hafs itag
-    cp ${PATHRT}/parm/postxconfig-NT-hafs.txt postxconfig-NT.txt
-    cp ${PATHRT}/parm/postxconfig-NT-hafs.txt postxconfig-NT_FH00.txt
-    cp ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
 fi
 
 if [ $DO_RRTMGP = .true. ]; then

diff --git a/tests/fv3_conf/regional_run_stoch.IN b/tests/fv3_conf/regional_run_stoch.IN
@@ -10,11 +10,6 @@ if [[ $POSTAPP = 'lam' ]]; then
     cp ${PATHRT}/parm/postxconfig-NT-fv3lam.txt postxconfig-NT.txt
     cp ${PATHRT}/parm/postxconfig-NT-fv3lam.txt postxconfig-NT_FH00.txt
     cp ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
-elif [[ $POSTAPP = 'hafs' ]]; then
-    cp ${PATHRT}/parm/post_itag_hafs itag
-    cp ${PATHRT}/parm/postxconfig-NT-hafs.txt postxconfig-NT.txt
-    cp ${PATHRT}/parm/postxconfig-NT-hafs.txt postxconfig-NT_FH00.txt
-    cp ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
 fi
 
 if [ $DO_RRTMGP = .true. ]; then

diff --git a/tests/parm/diag_table/diag_table_hafs_template b/tests/parm/diag_table/diag_table_hafs_template
@@ -2,11 +2,13 @@ ufs.hafs
 @[SYEAR] @[SMONTH] @[SDAY] @[SHOUR] 0 0
 
 #output files
-"grid_spec",     -1,  "months",  1,  "days",   "time"
+ "grid_spec",     -1,  "months",  1,  "days",   "time"
 #"atmos_4xdaily",  1,  "hours",   1,  "days",   "time"
-"atmos_static",  -1,  "hours",   1,  "hours",  "time"
-"fv3_history",    0,  "hours",   1,  "hours",  "time"
-"fv3_history2d",  0,  "hours",   1,  "hours",  "time"
+ "atmos_static",  -1,  "hours",   1,  "hours",  "time"
+ "grid_mspec%4yr%2mo%2dy%2hr",  3,  "hours",   1,  "hours",  "time",   3, "hours"
+ "atmos_diag%4yr%2mo%2dy%2hr",  3,  "hours",   1,  "hours",  "time",   3, "hours"
+ "fv3_history",    0,  "hours",   1,  "hours",  "time"
+ "fv3_history2d",  0,  "hours",   1,  "hours",  "time"
 #"ref3D",          0,  "hours",   1,  "hours",  "time"
 #"maxmin2D",       1,  "hours",   1,  "hours",  "time"
 
@@ -17,11 +19,21 @@ ufs.hafs
 ###
 # grid_spec
 ###
- "dynamics", "grid_lon", "grid_lon", "grid_spec", "all", .false.,  "none", 2,
- "dynamics", "grid_lat", "grid_lat", "grid_spec", "all", .false.,  "none", 2,
+ "dynamics", "grid_lon",  "grid_lon",  "grid_spec", "all", .false.,  "none", 2,
+ "dynamics", "grid_lat",  "grid_lat",  "grid_spec", "all", .false.,  "none", 2,
  "dynamics", "grid_lont", "grid_lont", "grid_spec", "all", .false.,  "none", 2,
  "dynamics", "grid_latt", "grid_latt", "grid_spec", "all", .false.,  "none", 2,
- "dynamics", "area",     "area",     "grid_spec", "all", .false.,  "none", 2,
+ "dynamics", "area",      "area",      "grid_spec", "all", .false.,  "none", 2,
+###
+# grid_mspec
+###
+ "dynamics", "grid_mlon",  "grid_lon",  "grid_mspec%4yr%2mo%2dy%2hr", "all", .false.,  "none", 2,
+ "dynamics", "grid_mlat",  "grid_lat",  "grid_mspec%4yr%2mo%2dy%2hr", "all", .false.,  "none", 2,
+ "dynamics", "grid_mlont", "grid_lont", "grid_mspec%4yr%2mo%2dy%2hr", "all", .false.,  "none", 2,
+ "dynamics", "grid_mlatt", "grid_latt", "grid_mspec%4yr%2mo%2dy%2hr", "all", .false.,  "none", 2,
+ "dynamics", "marea",      "area",      "grid_mspec%4yr%2mo%2dy%2hr", "all", .false.,  "none", 2,
+#"dynamics", "mdx",        "dx",        "grid_mspec%4yr%2mo%2dy%2hr", "all", .false.,  "none", 2,
+#"dynamics", "mdy",        "dy",        "grid_mspec%4yr%2mo%2dy%2hr", "all", .false.,  "none", 2,
 ###
 # 4x daily output
 ###
@@ -107,6 +119,35 @@ ufs.hafs
  "dynamics",      "hybm",        "hybm",         "atmos_static",      "all", .false.,  "none", 2
  "dynamics",      "zsurf",       "zsurf",        "atmos_static",      "all", .false.,  "none", 2
 ###
+# GFDL tracker needed variables
+###
+#"dynamics",      "grid_lon",    "grid_lon",     "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2,
+#"dynamics",      "grid_lat",    "grid_lat",     "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2,
+ "dynamics",      "grid_mlon",   "grid_lon",     "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2,
+ "dynamics",      "grid_mlat",   "grid_lat",     "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2,
+ "dynamics",      "vort850",     "vort850",      "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2
+ "dynamics",      "vort700",     "vort700",      "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2
+ "dynamics",      "us",          "us",           "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2
+ "dynamics",      "u850",        "u850",         "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2
+ "dynamics",      "u700",        "u700",         "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2
+ "dynamics",      "u500",        "u500",         "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2
+ "dynamics",      "vs",          "vs",           "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2
+ "dynamics",      "v850",        "v850",         "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2
+ "dynamics",      "v700",        "v700",         "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2
+ "dynamics",      "v500",        "v500",         "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2
+ "dynamics",      "t850",        "t850",         "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2
+ "dynamics",      "t500",        "t500",         "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2
+ "dynamics",      "t300",        "t300",         "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2
+ "dynamics",      "slp",         "slp",          "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2
+ "dynamics",      "z850",        "z850",         "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2
+ "dynamics",      "z700",        "z700",         "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2
+ "dynamics",      "z500",        "z500",         "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2
+ "dynamics",      "z200",        "z200",         "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2
+ "dynamics",      "rh850",       "rh850",        "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2
+ "dynamics",      "rh500",       "rh500",        "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2
+#"gfs_phys",      "u10m",        "u10m",         "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2
+#"gfs_phys",      "v10m",        "v10m",         "atmos_diag%4yr%2mo%2dy%2hr",     "all", .false.,  "none", 2
+###
 # FV3 variabls needed for NGGPS evaluation
 ###
 "gfs_dyn",     "ucomp",       "ugrd",      "fv3_history",    "all",  .false.,  "none",  2

diff --git a/tests/parm/input_global_hafs.nml.IN b/tests/parm/input_global_hafs.nml.IN
@@ -126,6 +126,15 @@
        nest_joffsets= @[NEST_JOFFSETS]
 /
 
+ &fv_moving_nest_nml
+       surface_dir = "INPUT/moving_nest"
+       is_moving_nest = @[IS_MOVING_NEST]
+       vortex_tracker = @[VORTEX_TRACKER]
+       ntrack = @[NTRACK]
+       move_cd_x = @[MOVE_CD_X]
+       move_cd_y = @[MOVE_CD_Y]
+/
+
  &surf_map_nml
        zero_ocean = .false.
        cd4 = 0.15

diff --git a/tests/parm/input_regional_hafs.nml.IN b/tests/parm/input_regional_hafs.nml.IN
@@ -130,6 +130,15 @@
        nest_joffsets= @[NEST_JOFFSETS]
 /
 
+ &fv_moving_nest_nml
+       surface_dir = "INPUT/moving_nest"
+       is_moving_nest = @[IS_MOVING_NEST]
+       vortex_tracker = @[VORTEX_TRACKER]
+       ntrack = @[NTRACK]
+       move_cd_x = @[MOVE_CD_X]
+       move_cd_y = @[MOVE_CD_Y]
+/
+
  &surf_map_nml
        zero_ocean = .false.
        cd4 = 0.15
+7 −0		CMakeLists.txt
+1 −1		atmos_cubed_sphere
+79 −25		atmos_model.F90
+1 −0		ccpp/driver/GFS_init.F90
+18 −16		cpl/module_cap_cpl.F90
+269 −121		fv3_cap.F90
+12 −6		io/module_write_netcdf.F90
+543 −43		io/module_wrt_grid_comp.F90
+277 −83		module_fcst_grid_comp.F90
+1 −0		module_fv3_config.F90