Skip to content

Commit 43e3717

Browse files
selimnairbselimnairb
committed
- Added basin, hillslope, zone, and lu default files
- Imported parameters from newly added default files into param.sqlite
1 parent 997e358 commit 43e3717

9 files changed

+67
-15
lines changed

‎createParamDB.sh

+25-15
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,34 @@
33
sqlite3 params.sqlite < createParamDB.sql
44

55
# Insert params for the veg base classes
6-
./insertParams.py -v --type="stratum" --name="evergreen" --parentName="None" --user="RHESSys" defs/stratum/veg_evergreen.def
6+
./insertParams.py -v --type="stratum" --name="evergreen" --parentName="None" --user="RHESSys" defs/stratum/veg_evergreen.def
77
./insertParams.py -v --type="stratum" --name="deciduous" --parentName="None" --user="RHESSys" defs/stratum/veg_deciduous.def
8-
./insertParams.py -v --type="stratum" --name="grass" --parentName="None" --user="RHESSys" defs/stratum/veg_grass.def
9-
./insertParams.py -v --type="stratum" --name="nonveg" --parentName="None" --user="RHESSys" defs/stratum/veg_nonveg.def
8+
./insertParams.py -v --type="stratum" --name="grass" --parentName="None" --user="RHESSys" defs/stratum/veg_grass.def
9+
./insertParams.py -v --type="stratum" --name="nonveg" --parentName="None" --user="RHESSys" defs/stratum/veg_nonveg.def
1010

1111
# Insert params for the soil base classes
12-
./insertParams.py -v --type="soil" --name="clay" --parentName="None" --user="RHESSys" defs/soil/soil_clay.def
13-
./insertParams.py -v --type="soil" --name="clay-loam" --parentName="None" --user="RHESSys" defs/soil/soil_clayloam.def
14-
./insertParams.py -v --type="soil" --name="loam" --parentName="None" --user="RHESSys" defs/soil/soil_loam.def
15-
./insertParams.py -v --type="soil" --name="loamy-sand" --parentName="None" --user="RHESSys" defs/soil/soil_loamysand.def
16-
./insertParams.py -v --type="soil" --name="rock" --parentName="None" --user="RHESSys" defs/soil/soil_rock.def
17-
./insertParams.py -v --type="soil" --name="sand" --parentName="None" --user="RHESSys" defs/soil/soil_sand.def
18-
./insertParams.py -v --type="soil" --name="sandy-clay" --parentName="None" --user="RHESSys" defs/soil/soil_sandyclay.def
12+
./insertParams.py -v --type="soil" --name="clay" --parentName="None" --user="RHESSys" defs/soil/soil_clay.def
13+
./insertParams.py -v --type="soil" --name="clay-loam" --parentName="None" --user="RHESSys" defs/soil/soil_clayloam.def
14+
./insertParams.py -v --type="soil" --name="loam" --parentName="None" --user="RHESSys" defs/soil/soil_loam.def
15+
./insertParams.py -v --type="soil" --name="loamy-sand" --parentName="None" --user="RHESSys" defs/soil/soil_loamysand.def
16+
./insertParams.py -v --type="soil" --name="rock" --parentName="None" --user="RHESSys" defs/soil/soil_rock.def
17+
./insertParams.py -v --type="soil" --name="sand" --parentName="None" --user="RHESSys" defs/soil/soil_sand.def
18+
./insertParams.py -v --type="soil" --name="sandy-clay" --parentName="None" --user="RHESSys" defs/soil/soil_sandyclay.def
1919
./insertParams.py -v --type="soil" --name="sandy-clay-loam" --parentName="None" --user="RHESSys" defs/soil/soil_sandyclayloam.def
20-
./insertParams.py -v --type="soil" --name="sandy-loam" --parentName="None" --user="RHESSys" defs/soil/soil_sandyloam.def
21-
./insertParams.py -v --type="soil" --name="silt" --parentName="None" --user="RHESSys" defs/soil/soil_silt.def
22-
./insertParams.py -v --type="soil" --name="silt-clay" --parentName="None" --user="RHESSys" defs/soil/soil_siltyclay.def
20+
./insertParams.py -v --type="soil" --name="sandy-loam" --parentName="None" --user="RHESSys" defs/soil/soil_sandyloam.def
21+
./insertParams.py -v --type="soil" --name="silt" --parentName="None" --user="RHESSys" defs/soil/soil_silt.def
22+
./insertParams.py -v --type="soil" --name="silt-clay" --parentName="None" --user="RHESSys" defs/soil/soil_siltyclay.def
2323
./insertParams.py -v --type="soil" --name="silt-clay-loam" --parentName="None" --user="RHESSys" defs/soil/soil_siltyclayloam.def
24-
./insertParams.py -v --type="soil" --name="silt-loam" --parentName="None" --user="RHESSys" defs/soil/soil_siltyloam.def
25-
./insertParams.py -v --type="soil" --name="water" --parentName="None" --user="RHESSys" defs/soil/soil_water.def
24+
./insertParams.py -v --type="soil" --name="silt-loam" --parentName="None" --user="RHESSys" defs/soil/soil_siltyloam.def
25+
./insertParams.py -v --type="soil" --name="water" --parentName="None" --user="RHESSys" defs/soil/soil_water.def
26+
27+
# Insert params for the landuse base classes
28+
./insertParams.py -v --type="landuse" --name="agriculture" --parentName="None" --user="RHESSys" defs/lu/lu_ag2.def
29+
./insertParams.py -v --type="landuse" --name="undeveloped" --parentName="None" --user="RHESSys" defs/lu/lu_undev.def
30+
./insertParams.py -v --type="landuse" --name="urban" --parentName="None" --user="RHESSys" defs/lu/lu_urban3.def
31+
32+
# Insert params for the basin, hillslope, and zone base classes
33+
./insertParams.py -v --type="basin" --name="basin" --parentName="None" --user="RHESSys" defs/basin.def
34+
./insertParams.py -v --type="hillslope" --name="hillslope" --parentName="None" --user="RHESSys" defs/hillslope.def
35+
./insertParams.py -v --type="zone" --name="zone" --parentName="None" --user="RHESSys" defs/zone.def
2636

‎defs/basin.def

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1 basin_default_ID

‎defs/hillslope.def

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
1 hillslope_default_ID
2+
1.0 sat_to_gw_coeff
3+
1.0 gw_loss_coeff

‎defs/lu/lu_ag2.def

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2 landuse_default_ID
2+
0.0 irrigation (m/m2/year)
3+
0.0 fertilizer_NO3 (kg/m2/year)
4+
0.013 fertilizer_NH4 (kg/m2/year)
5+
0.0 septic_NO3_load (kg/m2/year)
6+
0.0 septic_water_load (m/m2/year)
7+
0.0 detention_store_size

‎defs/lu/lu_undev.def

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
1 landuse_default_ID
2+
0.0 irrigation (m/m2/year)
3+
0.0 fertilizer_NO3 (kg/m2/year)
4+
0.0 fertilizer_NH4 (kg/m2/year)
5+
0.0 septic_NO3_load (kg/m2/year)
6+
0.0 septic_water_load (m/m2/year)
7+
0.0 detention_store_size

‎defs/lu/lu_urban3.def

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
3 landuse_default_ID
2+
0.0 irrigation (m/m2/year)
3+
0.0 fertilizer_NO3 (kg/m2/year)
4+
0.0 fertilizer_NH4 (kg/m2/year)
5+
0.0 septic_NO3_load (kg/m2/year)
6+
0.0 septic_water_load (m/m2/year)
7+
0.0 detention_store_size

‎defs/zone.def

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
1 zone_default_ID /*RHESSys V5 standard zone default file */
2+
0.000029 atm_trans_lapse_rate /* Values provided by Tague */
3+
0.0015 dewpoint_lapse_rate
4+
10 max_effective_lai
5+
0.0064 lapse_rate
6+
0.0254 pptmin
7+
0.75 sea_level_clear_sky_trans
8+
0.4 temcf
9+
0.003 trans_coeff1
10+
2.2 trans_coeff2
11+
1 wind
12+
-6 max_snow_temp
13+
-8 min_rain_temp
14+
0.001 n_deposition
15+

‎params.sqlite

5 KB
Binary file not shown.

‎searchParams.py

+2
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ def usage():
118118
elif o in ("-v", "--verbose"):
119119
verbose = True
120120

121+
if searchType == None: searchType = rpc.SEARCH_TYPE_CONSTRAINED
122+
121123
if (not outputFormat in rpc.VALID_FORMATS):
122124
msg = "Output format must be one of the following: ", rpc.VALID_FORMATS
123125
raise RuntimeError, msg

0 commit comments

Comments
 (0)