v2.1

update namelist and constants for v2.1
NCAR · Sep 14, 2022 · 0a53597 · 0a53597
2 parents 41ebd7e + 3a372d3
commit 0a53597
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 21 deletions.
diff --git a/helpers/genNetCDF/ICARoptions.py b/helpers/genNetCDF/ICARoptions.py
@@ -3,7 +3,7 @@ class ICARoptions:
     def __init__(self,
                  filename = 'icar_options.nml',
                  # model namelist
-                 model_version = 2.0,
+                 model_version = 2.1,
                  model_comment = 'Unit Test Data',
                  # output namelist
                  output_vars = ['u','v','precipitation','swe'],
@@ -63,7 +63,7 @@ def __init__(self,
                  t_is_potential = 'True',
                  time_varying_z = 'False',
                  ideal='True',
-                 debug='True',        # currently this writes the global jacobian to a netcdf file, and gives min/max values of the jacobian on runtime.  
+                 debug='True',        # currently this writes the global jacobian to a netcdf file, and gives min/max values of the jacobian on runtime.
                  smooth_wind_distance = '72000',
                  use_agl_height = True,   #  Use height above ground level to interpolate the wind field instead of height above sea level.
                  agl_cap = 400,  #   Height at which we switch from AGL-interpolation to using ASL-interpolation

diff --git a/run/complete_icar_options.nml b/run/complete_icar_options.nml
@@ -2,7 +2,7 @@
 !   Model and run meta-data
 !---------------------------------------------------------
 &model_version
-    version = "2.0",                      ! This must match the version of the compiled code
+    version = "2.1",                      ! This must match the version of the compiled code
     comment = "Add your comment here"     ! This will be stored in output files
 /
 
@@ -97,14 +97,28 @@
     ! Warning, convection can be unstable.
     ! wishlist = No Code Present yet
 
-    pbl = 0,  ! 1=legacy (deprecated)      2=Simple (Local HP96)        3=YSU             (N/A)
+    ! Planetary Boundary Layer Scheme
+    pbl = 0,  ! 1=legacy (deprecated)      2=Simple (Local HP96)        3=YSU (work in progress)
+
+    ! Land Surface Model
     lsm = 0,  ! 1=use prescribed fluxes    2=Simple LSM (N/A)           3=Noah LSM                  4=NoahMP
-    water=2,  ! 1=use prescribed (w/lsm=1) 2=Simple sea surface fluxes  3=Lake model (simple ocean)
+
+    ! Open water fluxes
+    water=0,  ! 1=use prescribed (w/lsm=1) 2=Simple sea surface fluxes  3=Lake model (simple ocean)
+
+    ! Microphysics Scheme
     mp  = 1,  ! 1=Thompson                 2=Simple (SB04)              3=Morrison                  4=WSM6      5=Thompson-Eidhammer    6=WSM3
+    ! Radiation Scheme
     rad = 0,  ! 1=use prescribed fluxes    2=Simple (empirical)         3=RRTMG
-    conv= 0,  ! 1=Tiedke Scheme            2=Simple Scheme (wishlist)   3=Kain-Fritsch (N/A)        4=NSAS      5=BMJ
-    adv = 1,  ! 1=Upwind                   2=MPDATA                     3=Adams-Bashforth (wishlist)
-    wind= 1   ! 1=Linear Theory
+
+    ! Convection / Cumulus Scheme
+    conv= 0,  ! 1=Tiedke Scheme            2=Simple Scheme (wishlist)   3=Kain-Fritsch              4=NSAS      5=BMJ
+
+    ! Advection Scheme
+    adv = 1,  ! 1=Upwind                   2=MPDATA                     3=Runga-Kutta (in progress?)
+
+    ! Wind field calculations
+    wind= 1   ! 1=Linear Theory            2=grid based,mass-conserving 3=iterative wind solver     4=implicit(in progress)  5=linear+iterative
 /
 
 !---------------------------------------------------------

diff --git a/run/short_icar_options.nml b/run/short_icar_options.nml
@@ -2,15 +2,15 @@
 !   Model and run meta-data
 !---------------------------------------------------------
 &model_version
-    version = "2.0",                      ! This must match the version of the compiled code
+    version = "2.1",                      ! This must match the version of the compiled code
     comment = "Add your comment here"     ! This will be stored in output files
 /
 
 !---------------------------------------------------------
 !   Specify output and restart files and output frequencies
 !---------------------------------------------------------
 &output_list
-    ! this is a list of variable names to be written in each output file
+    ! this is a list of variable names to be written in each output file see complete_icar_options file for list of variables
     names = "u","v","ta2m","hus2m", "precipitation", "swe"
 
     outputinterval = 3600   ! number of seconds between output time slices
@@ -29,33 +29,34 @@
 &physics
     ! Common precipitation downscaling run use pbl=0 lsm=0 mp=1 rad=0 conv=0 adv=1 wind=1
     ! For a FASTER run (simpler physics), set mp=2
-    ! If surface air temperature is important use pbl=2 lsm=3 rad=2 water=2 this requires Noah LSM data
-    ! Warning, convection can be unstable
+    ! If surface air temperature is important use pbl=2 lsm=4 rad=2 water=3 this requires NoahMP LSM data
+    ! Convection is OK, but not great, conv=5 seems best? requires lsm/pbl/etc options
+    !
     ! N/A = Not Available or Not fully implemented
     ! wishlist = No Code Present yet
 
     ! Planetary Boundary Layer Scheme
-    pbl = 0,  ! 1=legacy (deprecated)      2=Simple (Local HP96)        3=YSU             (N/A)
+    pbl = 0,  ! 1=legacy (deprecated)      2=Simple (Local HP96)        3=YSU (work in progress)
 
     ! Land Surface Model
     lsm = 0,  ! 1=use prescribed fluxes    2=Simple LSM (N/A)           3=Noah LSM                  4=NoahMP
 
     ! Open water fluxes
-    water=0,  ! 1=use prescribed (w/lsm=1) 2=Simple sea surface fluxes
+    water=0,  ! 1=use prescribed (w/lsm=1) 2=Simple sea surface fluxes  3=WRF-Lake model
 
     ! Microphysics Scheme
     mp  = 1,  ! 1=Thompson                 2=Simple (SB04)              3=Morrison                  4=WSM6      5=Thompson-Eidhammer    6=WSM3
     ! Radiation Scheme
     rad = 0,  ! 1=use prescribed fluxes    2=Simple (empirical)         3=RRTMG
 
     ! Convection / Cumulus Scheme
-    conv= 0,  ! 1=Tiedke Scheme            2=Simple Scheme (wishlist)   3=Kain-Fritsch
+    conv= 0,  ! 1=Tiedke Scheme            2=Simple Scheme (wishlist)   3=Kain-Fritsch              4=NSAS      5=BMJ
 
     ! Advection Scheme
-    adv = 1,  ! 1=Upwind                   2=MPDATA                     3=Adams-Bashforth (wishlist)
+    adv = 1,  ! 1=Upwind                   2=MPDATA                     3=Runga-Kutta (in progress?)
 
     ! Wind field calculations
-    wind= 1   ! 1=Linear Theory
+    wind= 1   ! 1=Linear Theory            2=grid based,mass-conserving 3=iterative wind solver     4=implicit(in progress)  5=linear+iterative
 /
 
 !---------------------------------------------------------
@@ -106,11 +107,11 @@
     !   WARNING : ICAR can be surprisingly sensitive to this parameter
     nz = 15, ! []
     !   Set this to true if the zvar in the input data is actually in units of geopotential height (m/s^2)
-    z_is_geopotential = True,
+    z_is_geopotential = False,
     !   Set this to true if the zvar in the input data is specified on the interfaces between mass levels
-    z_is_on_interface = True,
+    z_is_on_interface = False,
     !   Specify that the height of the forcing data will change through the simulation (common for atmospheric model-level output)
-    time_varying_z = true,
+    time_varying_z = True,
     !   Use height above ground level to interpolate the wind field instead of height above sea level.
     use_agl_height = False,
 

diff --git a/src/constants/icar_constants.f90 b/src/constants/icar_constants.f90
@@ -6,7 +6,7 @@ module icar_constants
 
     implicit none
 
-    character(len=5) :: kVERSION_STRING = "2.0"
+    character(len=5) :: kVERSION_STRING = "2.1"
 
     ! string lengths
     integer, parameter :: kMAX_FILE_LENGTH = 1024