Add revisions from review, Install capabilities for Ps nudging and user-defined nudging windows

Author: patcal

bld/namelist_files/namelist_definition.xml

@@ -248,7 +248,7 @@
 
 <entry id="Nudge_SpectralNring" type="integer" category="nudging"
        group="nudging_nl" valid_values="" >
-       Set size of local-area grid used to suppress Samping Errors.
+       Set size of local-area grid used to suppress Sampling Errors.
 
        Nudge_SpectralNring  - INT The number of sampling rings used for local area averaging
                                   of spherical harmonic modes, to suppress sampling errors.
@@ -258,7 +258,7 @@
                                   in this sampling domain.
                                   Each ring (kk) contains 8*(kk-1) sample points.
 
-                                     Nudge_SpectralNring     Number of Samping Points
+                                     Nudge_SpectralNring     Number of Sampling Points
                                      -------------------     -------------------------
                                         1                        1      (DEFAULT SampleGrid NOT used)
                                         2                        9
@@ -354,6 +354,9 @@
          0 == OFF      (No Nudging of this variable)
          1 == CONSTANT (Spatially Uniform Nudging)
          2 == HEAVISIDE WINDOW FUNCTION
+         3 == HEAVISIDE WINDOW FUNCTION IN VERTICAL
+              and USER SPECIFIED HORIZONAL DOMAIN
+              (Specified by user via Nudge_Bwindow_File)
        Default: 0
        </entry>
 
@@ -370,6 +373,9 @@
          0 == OFF      (No Nudging of this variable)
          1 == CONSTANT (Spatially Uniform Nudging)
          2 == HEAVISIDE WINDOW FUNCTION
+         3 == HEAVISIDE WINDOW FUNCTION IN VERTICAL
+              and USER SPECIFIED HORIZONAL DOMAIN
+              (Specified by user via Nudge_Bwindow_File)
        Default: 0
        </entry>
 
@@ -386,6 +392,9 @@
          0 == OFF      (No Nudging of this variable)
          1 == CONSTANT (Spatially Uniform Nudging)
          2 == HEAVISIDE WINDOW FUNCTION
+         3 == HEAVISIDE WINDOW FUNCTION IN VERTICAL
+              and USER SPECIFIED HORIZONAL DOMAIN
+              (Specified by user via Nudge_Bwindow_File)
        Default: 0
        </entry>
 
@@ -402,6 +411,9 @@
          0 == OFF      (No Nudging of this variable)
          1 == CONSTANT (Spatially Uniform Nudging)
          2 == HEAVISIDE WINDOW FUNCTION
+         3 == HEAVISIDE WINDOW FUNCTION IN VERTICAL
+              and USER SPECIFIED HORIZONAL DOMAIN
+              (Specified by user via Nudge_Bwindow_File)
        Default: 0
        </entry>
 
@@ -414,10 +426,12 @@
 
 <entry id="Nudge_PSprof" type="integer" category="nudging"
        group="nudging_nl" valid_values="" >
-       Profile index for PS nudging.
+       Profile index for PS nudging.(Horizontal Only)
          0 == OFF      (No Nudging of this variable)
          1 == CONSTANT (Spatially Uniform Nudging)
          2 == HEAVISIDE WINDOW FUNCTION
+         3 == USER SPECIFIED HORIZONAL DOMAIN
+              (Specified by user via Nudge_Bwindow_File)
        Default: 0
        </entry>
 
@@ -428,6 +442,14 @@
        Default: 0.
        </entry>
 
+<entry id="Nudge_PSscal" type="real" category="nudging"
+	group="nudging_nl" valid_values="" >
+       Coeffcient controling the vertical influence function.
+          Nudge_PSscal < 1.0 : P'(n) = [    B(n)      ]*(Target_Ps - Model_Ps)
+          Nudge_PSscal > 1.0 : P'(n) = [(Pref/P0)**scl]*(Target_Ps - Model_Ps)
+       Default: 0.
+       </entry>
+
 <entry id="Nudge_Hwin_lat0" type="real" category="nudging"
        group="nudging_nl" valid_values="" >
        LAT0 center of Horizontal Window in degrees [-90.,90.].
@@ -508,6 +530,13 @@
        Default: FALSE
        </entry>
 
+<entry id="Nudge_Bwindow_File" type="char*256" input_pathname="abs" category="nudging"
+       group="nudging_nl" valid_values="" >
+       Filename for the Horizonal Boundary Window to use for nudging with profile option 3.
+        (e.g. '/$DIN_LOC_ROOT/atm/cam/nudging/BoundaryWindowFile.nc')
+       Default: 'BoundaryWindowFile.nc'
+       </entry>
+
 <entry id="Nudge_ZonalFilter" type="logical" category="nudging"
        group="nudging_nl" valid_values="" >
        Switch to turn on zonal mean filtering nudging.  If TRUE, the nudging scheme

cime_config/testdefs/testmods_dirs/cam/nudging/user_nl_cam

@@ -20,6 +20,8 @@
  Nudge_TimeScale_Opt = 0
  Nudge_Times_Per_Day=4
  Model_Times_Per_Day=48
+ Nudge_ZonalFilter=.false.
+ Nudge_ZonalNbasis=-1
  Nudge_SpectralFilter=.false.
  Nudge_SpectralNtrunc=-1
  Nudge_SpectralNring= 1
@@ -33,6 +35,7 @@
  Nudge_Qcoef  =0.00
  Nudge_PSprof =0
  Nudge_PScoef =0.00
+ Nudge_PSscal =0.00
  Nudge_Beg_Year =2008
  Nudge_Beg_Month=12
  Nudge_Beg_Day  =16
@@ -51,5 +54,6 @@
  Nudge_Vwin_Lindex  =5.
  Nudge_Vwin_Ldelta  =1.0
  Nudge_Vwin_Invert  =.false.
+ Nudge_Bwindow_File='BoundaryWindowFile.nc'
 /
 

cime_config/testdefs/testmods_dirs/cam/outfrq3s_nudging_f10_L26/user_nl_cam

@@ -24,8 +24,9 @@
  Nudge_Tcoef  =1.00
  Nudge_Qprof  =1
  Nudge_Qcoef  =1.00
- Nudge_PSprof =1
- Nudge_PScoef =1.00
+ Nudge_PSprof =0
+ Nudge_PScoef =0.00
+ Nudge_PSscal =0.00
  Nudge_Beg_Year =0001
  Nudge_Beg_Month=01
  Nudge_Beg_Day  =01

cime_config/testdefs/testmods_dirs/cam/outfrq3s_nudging_ne5_L26/user_nl_cam

@@ -24,8 +24,9 @@
  Nudge_Tcoef  =1.00
  Nudge_Qprof  =1
  Nudge_Qcoef  =1.00
- Nudge_PSprof =1
- Nudge_PScoef =1.00
+ Nudge_PSprof =0
+ Nudge_PScoef =0.00
+ Nudge_PSscal =0.00
  Nudge_Beg_Year =0001
  Nudge_Beg_Month=01
  Nudge_Beg_Day  =01