[Dart-dev] DART/branches Revision: 11455
dart at ucar.edu
dart at ucar.edu
Tue Apr 11 15:47:37 MDT 2017
thoar at ucar.edu
2017-04-11 15:47:35 -0600 (Tue, 11 Apr 2017)
141
Trying to remove the redundant DART KINDs with unique ones with more
meaningful names. Not all the names are meaningful yet. Working on it.
Modified: DART/branches/Tb/models/clm/work/input.nml
===================================================================
--- DART/branches/Tb/models/clm/work/input.nml 2017-04-11 21:35:26 UTC (rev 11454)
+++ DART/branches/Tb/models/clm/work/input.nml 2017-04-11 21:47:35 UTC (rev 11455)
@@ -180,39 +180,39 @@
clm_variables = 'H2OSOI_LIQ', 'KIND_SOIL_MOISTURE', '0', '1510', 'RESTART', 'UPDATE',
'T_SOISNO', 'KIND_SOIL_TEMPERATURE', '200', '330', 'RESTART', 'UPDATE',
'T_VEG', 'KIND_VEGETATION_TEMPERATURE', '200', '330', 'RESTART', 'NO_COPY_BACK',
- 'SNLSNO', 'KIND_TEMP', 'NA', 'NA', 'RESTART', 'NO_COPY_BACK',
- 'T_GRND', 'KIND_SKIN_TEMPERATURE', '200', '330', 'RESTART', 'NO_COPY_BACK',
+ 'SNLSNO', 'KIND_NUM_SNOW_LAYERS', 'NA', 'NA', 'RESTART', 'NO_COPY_BACK',
+ 'T_GRND', 'KIND_SKIN_TEMPERATURE', '200', '330', 'RESTART', 'NO_COPY_BACK',
'frac_sno', 'KIND_SNOWCOVER_FRAC', '0', '1', 'RESTART', 'NO_COPY_BACK',
'H2OSNO', 'KIND_SNOW_WATER', '0', '1000', 'RESTART', 'UPDATE',
'H2OSOI_ICE', 'KIND_ICE', '0', '1510', 'RESTART', 'UPDATE',
'SNOWDP', 'KIND_SNOW_THICKNESS', '0', '10', 'RESTART', 'UPDATE',
'H2OCAN', 'KIND_CANOPY_WATER', 'NA', 'NA', 'RESTART', 'NO_COPY_BACK',
- 'SANDFRAC_CKYH', 'KIND_TEMP', 'NA', 'NA', 'RESTART', 'NO_COPY_BACK',
- 'CLAYFRAC_CKYH', 'KIND_TEMP', 'NA', 'NA', 'RESTART', 'NO_COPY_BACK',
- 'T_VEG_CKYH', 'KIND_TEMP', 'NA', 'NA', 'RESTART', 'NO_COPY_BACK',
- 'ELAI_CKYH', 'KIND_TEMP', 'NA', 'NA', 'RESTART', 'NO_COPY_BACK',
- 'VF_CKYH', 'KIND_TEMP', 'NA', 'NA', 'RESTART', 'NO_COPY_BACK',
- 'FORC_PBOT_CKYH', 'KIND_TEMP', 'NA', 'NA', 'RESTART', 'NO_COPY_BACK',
- 'FORC_T_CKYH', 'KIND_TEMP', 'NA', 'NA', 'RESTART', 'NO_COPY_BACK',
- 'FORC_RH_CKYH', 'KIND_TEMP', 'NA', 'NA', 'RESTART', 'NO_COPY_BACK',
- 'STICKINESS_CKYH','KIND_RTM_PARAMETERS_P', 'NA', 'NA', 'RESTART', 'UPDATE',
- 'B_PRIME_CKYH', 'KIND_RTM_PARAMETERS_P', 'NA', 'NA', 'RESTART', 'UPDATE',
- 'X_LAMBDA_CKYH', 'KIND_RTM_PARAMETERS_N', 'NA', 'NA', 'RESTART', 'UPDATE',
+ 'SANDFRAC_CKYH', 'KIND_SAND_FRACTION', 'NA', 'NA', 'RESTART', 'NO_COPY_BACK',
+ 'CLAYFRAC_CKYH', 'KIND_CLAY_FRACTION', 'NA', 'NA', 'RESTART', 'NO_COPY_BACK',
+ 'T_VEG_CKYH', 'KIND_VEGETATION_TEMPERATURE', 'NA', 'NA', 'RESTART', 'NO_COPY_BACK',
+ 'ELAI_CKYH', 'KIND_LEAF_AREA_INDEX', 'NA', 'NA', 'RESTART', 'NO_COPY_BACK',
+ 'VF_CKYH', 'KIND_VF_CKYH' 'NA', 'NA', 'RESTART', 'NO_COPY_BACK',
+ 'FORC_PBOT_CKYH', 'KIND_FORC_PBOT_CKYH', 'NA', 'NA', 'RESTART', 'NO_COPY_BACK',
+ 'FORC_T_CKYH', 'KIND_FORC_T_CKYH', 'NA', 'NA', 'RESTART', 'NO_COPY_BACK',
+ 'FORC_RH_CKYH', 'KIND_FORC_RH_CKYH', 'NA', 'NA', 'RESTART', 'NO_COPY_BACK',
+ 'STICKINESS_CKYH','KIND_STICKINESS_CKYH', 'NA', 'NA', 'RESTART', 'UPDATE',
+ 'B_PRIME_CKYH', 'KIND_B_PRIME_CKYH', 'NA', 'NA', 'RESTART', 'UPDATE',
+ 'X_LAMBDA_CKYH', 'KIND_X_LAMBDA_CKYH', 'NA', 'NA', 'RESTART', 'UPDATE',
'DZSNO', 'KIND_SNOW_THICKNESS', 'NA', 'NA', 'RESTART', 'UPDATE',
- 'ZSNO', 'KIND_TEMP', 'NA', 'NA', 'RESTART', 'NO_COPY_BACK',
- 'ZISNO', 'KIND_TEMP', 'NA', 'NA', 'RESTART', 'NO_COPY_BACK',
+ 'ZSNO', 'KIND_SNOW_DEPTH', 'NA', 'NA', 'RESTART', 'NO_COPY_BACK',
+ 'ZISNO', 'KIND_SNOW_INTERFACES', 'NA', 'NA', 'RESTART', 'NO_COPY_BACK',
'snw_rds', 'KIND_SNOW_GRAIN_SIZE', 'NA', 'NA', 'RESTART', 'UPDATE',
- 'WT', 'KIND_TOTAL_WATER_STORAGE', '0', 'NA', 'RESRART', 'UPDATE',
- 'WA', 'KIND_TOTAL_WATER_STORAGE', '0', 'NA', 'RESRART', 'UPDATE',
- 'LAI', 'KIND_MODIS_LAI', 'NA', 'NA', 'LAIIN', 'NO_COPY_BACK',
- 'WATSAT', 'KIND_MVPARA_ZL', 'NA', 'NA', 'AUXIIN', 'NO_COPY_BACK',
- 'SANDFRAC_C', 'KIND_MVPARA_ZL', 'NA', 'NA', 'AUXIIN', 'NO_COPY_BACK',
- 'CLAYFRAC_C', 'KIND_MVPARA_ZL', 'NA', 'NA', 'AUXIIN', 'NO_COPY_BACK',
- 'FMV', 'KIND_MVPARA_ZL', 'NA', 'NA', 'AUXIIN', 'NO_COPY_BACK',
- 'BMV', 'KIND_MVPARA_ZL', 'NA', 'NA', 'AUXIIN', 'NO_COPY_BACK',
- 'XMV', 'KIND_MVPARA_ZL', 'NA', 'NA', 'AUXIIN', 'NO_COPY_BACK',
- 'QMV', 'KIND_MVPARA_ZL', 'NA', 'NA', 'AUXIIN', 'NO_COPY_BACK',
- 'HMV', 'KIND_MVPARA_ZL', 'NA', 'NA', 'AUXIIN', 'NO_COPY_BACK',
+ 'WT', 'KIND_TOTAL_WATER_STORAGE', '0', 'NA', 'RESTART', 'UPDATE',
+ 'WA', 'KIND_WATER_UNCONFINED', '0', 'NA', 'RESTART', 'UPDATE',
+ 'LAI', 'KIND_LEAF_AREA_INDEX', 'NA', 'NA', 'LAIIN', 'NO_COPY_BACK',
+ 'WATSAT', 'KIND_SATURATED_WATER', 'NA', 'NA', 'AUXIIN', 'NO_COPY_BACK',
+ 'SANDFRAC_C', 'KIND_CALIBRATED_SANDFRAC', 'NA', 'NA', 'AUXIIN', 'NO_COPY_BACK',
+ 'CLAYFRAC_C', 'KIND_CALIBRATED_CLAYFRAC', 'NA', 'NA', 'AUXIIN', 'NO_COPY_BACK',
+ 'FMV', 'KIND_RTM_FMV', 'NA', 'NA', 'AUXIIN', 'NO_COPY_BACK',
+ 'BMV', 'KIND_RTM_BMV', 'NA', 'NA', 'AUXIIN', 'NO_COPY_BACK',
+ 'XMV', 'KIND_RTM_XMV', 'NA', 'NA', 'AUXIIN', 'NO_COPY_BACK',
+ 'QMV', 'KIND_RTM_QMV', 'NA', 'NA', 'AUXIIN', 'NO_COPY_BACK',
+ 'HMV', 'KIND_RTM_HMV', 'NA', 'NA', 'AUXIIN', 'NO_COPY_BACK',
/
'tlai', 'KIND_LEAF_AREA_INDEX',
Modified: DART/branches/Tb/obs_kind/DEFAULT_obs_kind_mod.F90
===================================================================
--- DART/branches/Tb/obs_kind/DEFAULT_obs_kind_mod.F90 2017-04-11 21:35:26 UTC (rev 11454)
+++ DART/branches/Tb/obs_kind/DEFAULT_obs_kind_mod.F90 2017-04-11 21:47:35 UTC (rev 11455)
@@ -392,12 +392,44 @@
KIND_BRIGHTNESS_TEMPERATURE_36H = 337, &
KIND_BRIGHTNESS_TEMPERATURE_36V = 338, &
KIND_BRIGHTNESS_TEMPERATURE_89H = 339, &
- KIND_BRIGHTNESS_TEMPERATURE_89V = 340
+ KIND_BRIGHTNESS_TEMPERATURE_89V = 340, &
+ KIND_SNOW_GRAIN_SIZE = 341, &
+ KIND_RTM_PARAMETERS_P = 342, &
+ KIND_RTM_PARAMETERS_N = 343
+integer, parameter, public :: &
+ KIND_SAND_FRACTION = 345, &
+ KIND_CLAY_FRACTION = 346, &
+ KIND_VF_CKYH = 347, &
+ KIND_FORC_PBOT_CKYH = 348, &
+ KIND_FORC_T_CKYH = 349, &
+ KIND_FORC_RH_CKYH = 350, &
+ KIND_STICKINESS_CKYH = 351, &
+ KIND_B_PRIME_CKYH = 352, &
+ KIND_X_LAMBDA_CKYH = 353, &
+
+integer, parameter, public :: &
+ KIND_UNCONFINED_WATER = 355, &
+ KIND_SATURATED_WATER = 356, &
+ KIND_CALIBRATED_SANDFRAC = 357, &
+ KIND_CALIBRATED_CLAYFRAC = 358, &
More information about the Dart-dev
mailing list