Merge remote-tracking branch 'remotes/origin/feature/hafs_nest_sync' …

…into feature/hafs_vida
JohnSteffen-NOAA · Feb 10, 2022 · 805a896 · 805a896
2 parents 13726d8 + ea1f888
commit 805a896
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/parm/forecast/globnest/input.nml.tmp b/parm/forecast/globnest/input.nml.tmp
@@ -26,7 +26,7 @@
 /
 
  &fms2_io_nml
-netcdf_default_format="netcdf4"
+       netcdf_default_format="netcdf4"
 /
 
  &fms_nml
@@ -117,7 +117,7 @@ netcdf_default_format="netcdf4"
        target_lon = _target_lon_
        stretch_fac = _stretch_fac_
 
-       full_zs_filter = .F. !unreleased feature
+       full_zs_filter = .T. !unreleased feature
        n_zs_filter = 0
        nord_zs_filter = 4
 /
@@ -148,7 +148,7 @@ netcdf_default_format="netcdf4"
        n_del2_strong = 0
        n_del2_weak = 15
        n_del4 = 2
-       max_slope = 0.4
+       max_slope = 0.12
        peak_fac = 1.
 /
 

diff --git a/parm/forecast/globnest/input_nest.nml.tmp b/parm/forecast/globnest/input_nest.nml.tmp
@@ -25,6 +25,10 @@
        max_files_w = 1000,
 /
 
+ &fms2_io_nml
+       netcdf_default_format="netcdf4"
+/
+
  &fms_nml
        clock_grain = 'ROUTINE',
        domains_stack_size = 30000000,
@@ -122,9 +126,9 @@
        cd4 = 0.15
        cd2 = -1
        n_del2_strong = 0
-       n_del2_weak = 15
+       n_del2_weak = 20
        n_del4 = 2
-       max_slope = 0.4
+       max_slope = 0.15
        peak_fac = 1.
 /
 

diff --git a/parm/forecast/regional/input.nml.tmp b/parm/forecast/regional/input.nml.tmp
@@ -26,7 +26,7 @@
 /
 
  &fms2_io_nml
-netcdf_default_format="netcdf4"
+       netcdf_default_format="netcdf4"
 /
 
  &fms_nml
@@ -151,7 +151,7 @@ netcdf_default_format="netcdf4"
        n_del2_strong = 0
        n_del2_weak = 15
        n_del4 = 2
-       max_slope = 0.4
+       max_slope = 0.15
        peak_fac = 1.
 /
 

diff --git a/parm/forecast/regional/input_nest.nml.tmp b/parm/forecast/regional/input_nest.nml.tmp
@@ -26,7 +26,7 @@
 /
 
  &fms2_io_nml
-netcdf_default_format="netcdf4"
+       netcdf_default_format="netcdf4"
 /
 
  &fms_nml
@@ -126,9 +126,9 @@ netcdf_default_format="netcdf4"
        cd4 = 0.15
        cd2 = -1
        n_del2_strong = 0
-       n_del2_weak = 15
+       n_del2_weak = 24
        n_del4 = 2
-       max_slope = 0.4
+       max_slope = 0.3
        peak_fac = 1.
 /
 

diff --git a/parm/hafs.conf b/parm/hafs.conf
@@ -456,7 +456,7 @@ quilting=.true.
 write_groups=2
 write_tasks_per_group=48
 write_dopost=.false.
-output_history=.false.
+output_history=.true.
 
 # The option for output grid type: rotated_latlon, regional_latlon
 # Currently, the cubed_sphere_grid option is only supported by the forecast job, the post and product jobs cannot work for cubed_sphere_grid yet.

diff --git a/sorc/hafs_forecast.fd b/sorc/hafs_forecast.fd
+1 −1		FV3
+113 −52		tests/default_vars.sh
+101 −43		tests/parm/model_configure_hafs_shared.IN
+17 −0		tests/run_test.sh
+2 −0		tests/tests/hafs_regional_datm_cdeps
+16 −16		tests/tests/hafs_regional_telescopic_2nests_atm