Fix dddmp and lheatstrg settings

Previous commit did not properly update the values for dddmp and lheatstrg in the CROW config.\ Refs: NOAA-EMC#386
WalterKolczynski-NOAA · Jul 30, 2021 · c92c87c · c92c87c
1 parent 1bddba9
commit c92c87c
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 3 deletions.
diff --git a/workflow/cases/coupled_free_forecast.yaml b/workflow/cases/coupled_free_forecast.yaml
@@ -46,7 +46,7 @@ case:
     CPL_ATMIC: GEFSwithNOAHMP
     nst_anl: yes
     psm_bc: 1
-    dddmp: 0.2
+    dddmp: 0.1
     FSICL: 9999
     DO_SKEB: false
     DO_SHUM: false

diff --git a/workflow/cases/coupled_free_forecast_wave.yaml b/workflow/cases/coupled_free_forecast_wave.yaml
@@ -47,7 +47,7 @@ case:
     CPL_ATMIC: GEFSwithNOAHMP
     nst_anl: yes
     psm_bc: 1
-    dddmp: 0.2
+    dddmp: 0.1
     FSICL: 99999
     DO_SKEB: false
     DO_SHUM: false

diff --git a/workflow/config/fcst.yaml b/workflow/config/fcst.yaml
@@ -168,7 +168,7 @@ config_fcst:
     tbf=""
     if [ $satmedmf = ".true." ]; then tbf="_satmedmf" ; fi
 
-    export lheatstrg=.false.
+    export lheatstrg="{tools.fort(doc.fv3_gfs_settings.lheatstrg)}"
 
     export random_clds="{tools.fort(doc.fv3_gfs_settings.phy_dependent_var.random_clds)}"
     #export cnvcld="{tools.fort(doc.fv3_gfs_settings.cnvcld)}"

diff --git a/workflow/defaults/fv3_enkf.yaml b/workflow/defaults/fv3_enkf.yaml
@@ -20,6 +20,7 @@ fv3_enkf_defaults: &fv3_enkf_defaults
   MEMBER: -1
   d4_bg: 0.15
   dddmp: 0.1
+  lheatstrg: true
   ISEED: 0
   SET_STP_SEED: YES
 

diff --git a/workflow/defaults/fv3_gdas.yaml b/workflow/defaults/fv3_gdas.yaml
@@ -16,6 +16,7 @@ fv3_gdas_defaults: &fv3_gdas_defaults
   MEMBER: -1
   d4_bg: 0.15
   dddmp: 0.1
+  lheatstrg: true
   min_lakeice: 0.15
   min_seaice: 0.15
   ISEED: 0

diff --git a/workflow/defaults/fv3_gfs.yaml b/workflow/defaults/fv3_gfs.yaml
@@ -17,6 +17,7 @@ fv3_gfs_defaults: &fv3_gfs_defaults
   MEMBER: -1
   d4_bg: 0.15
   dddmp: 0.1
+  lheatstrg: true
   min_lakeice: 0.15
   min_seaice: 0.15 
   ISEED: 0

diff --git a/workflow/schema/fv3.yaml b/workflow/schema/fv3.yaml
@@ -58,6 +58,7 @@ fv3_settings_template: !Template &fv3_settings_template
   warm_start:         { type: bool }
   read_increment:     { type: bool }
   restart_interval:   { type: string }
+  lheatstrg:          { type: bool }
 #  FIELD_TABLE:        { type: string }
 
   LEVS: