[Dart-dev] DART/branches Revision: 12498

[dart at ucar.edu]

thoar at ucar.edu
2018-04-10 07:05:21 -0600 (Tue, 10 Apr 2018)
37
Making these consistent with Lanai.




Modified: DART/branches/lanai_terrsysmp/obs_kind/DEFAULT_obs_kind_mod.F90
===================================================================
--- DART/branches/lanai_terrsysmp/obs_kind/DEFAULT_obs_kind_mod.F90	2018-04-10 12:40:20 UTC (rev 12497)
+++ DART/branches/lanai_terrsysmp/obs_kind/DEFAULT_obs_kind_mod.F90	2018-04-10 13:05:21 UTC (rev 12498)
@@ -14,9 +14,8 @@
 
 module obs_kind_mod
 
-use    utilities_mod, only : register_module, error_handler,  &
-                             E_ERR, E_MSG, E_WARN,               &
-                             logfileunit, find_namelist_in_file, &
+use    utilities_mod, only : register_module, error_handler, E_ERR, E_WARN,  &
+                             logfileunit, find_namelist_in_file,             &
                              check_namelist_read, do_output, ascii_file_format
 
 implicit none
@@ -140,6 +139,12 @@
 integer, parameter, public :: &
     KIND_ALTIMETER_TENDENCY          = 48
 
+! kind for precip water; contrast with
+! total precip water (also in this file),
+! which is the total column integrated value.
+integer, parameter, public :: &
+    KIND_PRECIPITABLE_WATER          = 49
+
 ! kinds for the MITgcm, POP ocean model
 integer, parameter, public :: &
     KIND_SALINITY                    = 50, &
@@ -167,7 +172,7 @@
     KIND_INFRARED_BRIGHT_TEMP        = 61, &
     KIND_LANDMASK                    = 62
 
-! kind for unstructured grids 
+! kind for unstructured grids
 integer, parameter, public :: &
     KIND_EDGE_NORMAL_SPEED           = 63
 
@@ -185,8 +190,6 @@
     KIND_NADIR_RADIANCE              = 71, &
     KIND_TRACER_1_MIXING_RATIO       = 72, &  ! for active dust aerosols
     KIND_TRACER_2_MIXING_RATIO       = 73, &  ! for active dust aerosols
-    ! Is KIND_TRACER_MIXING_RATIO necessary with KIND_TRACER_CONCENTRATION
-    !   (= 29) available from the simple advection model?
     KIND_SOIL_TEMPERATURE            = 74, &  ! missing from WRF model_mod (?)
     KIND_SOIL_LIQUID_WATER           = 75     ! missing from WRF model_mod (?)
 
@@ -230,7 +233,7 @@
     KIND_SEASALT                     = 99
 
 ! kinds for ZVD (advanced microphysics)
-integer, parameter, public ::&
+integer, parameter, public :: &
     KIND_HAIL_MIXING_RATIO           = 100, &
     KIND_HAIL_NUMBER_CONCENTR        = 101, &
     KIND_GRAUPEL_VOLUME              = 102, &
@@ -263,66 +266,121 @@
     KIND_ROOT_NITROGEN               = 125, &
     KIND_STEM_NITROGEN               = 126, &
     KIND_LEAF_NITROGEN               = 127, &
-    KIND_WATER_TABLE_DEPTH           = 128
+    KIND_WATER_TABLE_DEPTH           = 128, &
+    KIND_FRAC_PHOTO_AVAIL_RADIATION  = 129, &
+    KIND_TOTAL_WATER_STORAGE         = 130
 
-! kinds for NOAH  (Tim Hoar)
 integer, parameter, public :: &
-    KIND_NEUTRON_INTENSITY           = 129, &
-    KIND_CANOPY_WATER                = 130, &
-    KIND_GROUND_HEAT_FLUX            = 131
+    KIND_NEUTRON_INTENSITY           = 140, &
+    KIND_CANOPY_WATER                = 141, &
+    KIND_GROUND_HEAT_FLUX            = 142
 
-! more kinds for TIEGCM Alex Chartier 
-integer, parameter, public :: &
-    KIND_VERTICAL_TEC                = 132  ! total electron content
-
 !! For now we have agreed to reserve kind numbers 151 to 250
 !! for chemistry types, specifically for WRF-Chem/DART, but
 !! possibly of interest to other models with Chemistry species.
 !! DO NOT USE numbers between 151-250 without talking to me, please?  (nancy)
 
-! kinds for GITM (Alexey Morozov)
+! these chemistry kinds match the numbers Arthur Mizzi is using
 integer, parameter, public :: &
-  KIND_TEMPERATURE_ELECTRON          = 251, &
-  KIND_TEMPERATURE_ION               = 252, &
-  KIND_DENSITY_NEUTRAL_O3P           = 253, &
-  KIND_DENSITY_NEUTRAL_O2            = 254, &
-  KIND_DENSITY_NEUTRAL_N2            = 255, &
-  KIND_DENSITY_NEUTRAL_N4S           = 256, &
-  KIND_DENSITY_NEUTRAL_NO            = 257, &
-  KIND_DENSITY_NEUTRAL_N2D           = 258, &
-  KIND_DENSITY_NEUTRAL_N2P           = 259, &
-  KIND_DENSITY_NEUTRAL_H             = 260, &
-  KIND_DENSITY_NEUTRAL_HE            = 261, &
-  KIND_DENSITY_NEUTRAL_CO2           = 262, &
-  KIND_DENSITY_NEUTRAL_O1D           = 263, &
-  KIND_DENSITY_ION_O4SP              = 264, &
-  KIND_DENSITY_ION_O2P               = 265, &