portland mod

rogerlew · Aug 27, 2020 · 9953398 · 9953398
1 parent f5a2597
commit 9953398
Show file tree

Hide file tree

Showing 25 changed files with 644 additions and 24 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/wepppy.iml b/.idea/wepppy.iml
diff --git a/wepppy/_scripts/BullRun6.py b/wepppy/_scripts/BullRun6.py
@@ -225,7 +225,7 @@ def _gridmet_cli_adjust(cli_dir, cli_fn, watershed):
     for scenario in scenarios:
         for watershed in watersheds:
             projects.append(deepcopy(watershed))
-            projects[-1]['cfg'] = scenario.get('cfg', 'lt')
+            projects[-1]['cfg'] = scenario.get('cfg', 'portland')
             projects[-1]['landuse'] = scenario['landuse']
             projects[-1]['cli_mode'] = scenario.get('cli_mode', 'observed')
             projects[-1]['clean'] = scenario['clean']

diff --git a/wepppy/nodb/base.py b/wepppy/nodb/base.py
@@ -195,6 +195,10 @@ def trigger(self, evt):
             lt = wepppy.nodb.mods.LakeTahoe.getInstance(self.wd)
             lt.on(evt)
 
+        if 'portland' in self.mods:
+            lt = wepppy.nodb.mods.PortlandMod.getInstance(self.wd)
+            lt.on(evt)
+
         if 'baer' in self.mods:
             baer = wepppy.nodb.mods.Baer.getInstance(self.wd)
             baer.on(evt)

diff --git a/wepppy/nodb/configs/lt-wepp_347f3bd.cfg b/wepppy/nodb/configs/lt-wepp_347f3bd.cfg
@@ -0,0 +1,38 @@
+[general]
+name=LakeTahoe
+cellsize=30
+w3w_api_key=XBL7LV7I
+
+[topaz]
+mcl=60
+csa=5
+zoom_min=11
+
+[landuse]
+enable_landuse_change=True
+cover_defaults=MODS_DIR/lt/data/lt_cover_defaults.csv
+
+[soils]
+
+[map]
+center0 = [39.0597, -120.0119]
+zoom0 = 9
+# relative to static
+boundary = /static/mods/lt/lt_basin.json
+
+[nodb]
+mods = ['lt']
+
+[climate]
+observed_clis_wc = MODS_DIR/lt/data/tahoe/observed/Daily/y2k_fixed/
+future_clis_wc = None
+daymet_observed = lt/daymet
+
+[phosphorus_opts]
+surf_runoff = 0.003
+lateral_flow = 0.004
+baseflow = 0.005
+sediment = 1200
+
+[wepp]
+bin = wepp_347f3bd
diff --git a/wepppy/nodb/configs/portland-simfire-eagle.cfg b/wepppy/nodb/configs/portland-simfire-eagle.cfg
@@ -11,7 +11,7 @@ zoom_min=11
 [landuse]
 enable_landuse_change=True
 sbs_map = MODS_DIR/portland/simfire/SBS_pred_Eagle_BullRun_all.tif
-cover_defaults=MODS_DIR/lt/data/lt_cover_defaults.csv
+cover_defaults=MODS_DIR/portland/lt_cover_defaults.csv
 
 [soils]
 ssurgo_db = portland/soils
@@ -23,7 +23,7 @@ zoom0 = 9
 boundary =
 
 [nodb]
-mods = []
+mods = ['portland', 'baer', 'debris_flow']
 
 [climate]
 observed_clis_wc = None

diff --git a/wepppy/nodb/configs/portland-simfire-norse.cfg b/wepppy/nodb/configs/portland-simfire-norse.cfg
@@ -11,7 +11,7 @@ zoom_min=11
 [landuse]
 enable_landuse_change=True
 sbs_map = MODS_DIR/portland/simfire/SBS_pred_Norse_BullRun_all.tif
-cover_defaults=MODS_DIR/lt/data/lt_cover_defaults.csv
+cover_defaults=MODS_DIR/portland/lt_cover_defaults.csv
 
 [soils]
 ssurgo_db = portland/soils
@@ -23,7 +23,7 @@ zoom0 = 9
 boundary =
 
 [nodb]
-mods = []
+mods = ['portland', 'baer', 'debris_flow']
 
 [climate]
 observed_clis_wc = None

diff --git a/wepppy/nodb/configs/portland.cfg b/wepppy/nodb/configs/portland.cfg
@@ -12,7 +12,7 @@ zoom_min=11
 enable_landuse_change=False
 sbs_map =
 nlcd_db = portland/nlcd
-cover_defaults=MODS_DIR/lt/data/lt_cover_defaults.csv
+cover_defaults=MODS_DIR/portland/lt_cover_defaults.csv
 
 [soils]
 ssurgo_db = portland/soils
@@ -24,7 +24,7 @@ zoom0 = 9
 boundary =
 
 [nodb]
-mods = []
+mods = ['portland']
 
 [climate]
 observed_clis_wc = None

diff --git a/wepppy/nodb/landuse.py b/wepppy/nodb/landuse.py
@@ -431,7 +431,7 @@ def landuseoptions(self):
         if 'baer' in self.mods:
             landuseoptions = [opt for opt in landuseoptions if 'Agriculture' not in opt['ManagementFile']]
 
-        if "lt" in self.mods:
+        if "lt" in self.mods or "portland" in self.mods:
             landuseoptions = [opt for opt in landuseoptions if 'Tahoe' in opt['ManagementFile']]
 
         return landuseoptions

diff --git a/wepppy/nodb/mods/baer/baer.py b/wepppy/nodb/mods/baer/baer.py
@@ -416,7 +416,7 @@ def remap_landuse(self):
                 domlc_d = sbs.build_lcgrid(self.subwta_arc, None)
 
                 ron = Ron.getInstance(wd)
-                if 'lt' in ron.mods:
+                if 'lt' in ron.mods or 'portland' in ron.mods:
                     for k, sbs in domlc_d.items():
                         # lt shrub
                         if landuse.domlc_d[k] == '104':
@@ -611,7 +611,7 @@ def modify_soils(self):
         wd = self.wd
 
         ron = Ron.getInstance(wd)
-        if 'lt' in ron.mods:
+        if 'lt' in ron.mods or 'portland' in ron.mods:
             return
 
         soils_dir = self.soils_dir

diff --git a/wepppy/nodb/mods/lt/lt.py b/wepppy/nodb/mods/lt/lt.py
@@ -116,7 +116,7 @@ def remap_landuse(self):
             landuse.unlock('-f')
             raise
 
-    def modify_soils(self, default_wepp_type='Volcanic', lc_lookup_fn='landSoilLookup.csv'):
+    def modify_soils(self, default_wepp_type='Granitic', lc_lookup_fn='landSoilLookup.csv'):
         wd = self.wd
         soils_dir = self.soils_dir
 

diff --git a/wepppy/nodb/mods/portland/__init__.py b/wepppy/nodb/mods/portland/__init__.py
@@ -0,0 +1 @@
+from .portland import PortlandMod
diff --git a/wepppy/nodb/mods/portland/ki25krcs.csv b/wepppy/nodb/mods/portland/ki25krcs.csv
@@ -0,0 +1,71 @@
+Code,LndcvrID,WEPP_Type,New_WEPPman,ManName,Albedo,iniSatLev,interErod,rillErod,critSh,effHC,soilDepth,Sand,Clay,OM,CEC,Comment
+1100,100,Granitic,Tahoe_Bare_Slope.rot,Bare,None,None,300000,0.025,4,None,None,None,None,None,None,
+1101,101,Granitic,Tahoe_Sod_Grass.rot,Sod_G,None,None,750000,0.02,4,None,None,None,None,None,None,
+1101,101,Granitic,Tahoe_Sod_Grass.rot,Sod_G,None,None,750000,0.015,4,None,None,None,None,None,None,
+1102,102,Granitic,Tahoe_Old_Forest.rot,OForst,None,None,250000,2.00E-03,4,None,None,None,None,None,None,
+1103,103,Granitic,Tahoe_Bunch_Grass.rot,BnchG,None,None,600000,1.50E-03,4,None,None,None,None,None,None,
+1104,104,Granitic,Tahoe_Shrub.rot,Shrub,None,None,300000,1.25E-03,4,None,None,None,None,None,None,
+1105,105,Granitic,Tahoe_High_Severity_Fire.rot,HighF,None,None,1800000,0.0002,4,None,None,None,None,None,None,
+1106,106,Granitic,Tahoe_Low_Severity_Fire.rot,LowF,None,None,1000000,0.00015,4,None,None,None,None,None,None,
+1107,107,Granitic,Tahoe_Young_Forest.rot,YForst,None,None,400000,1.00E-04,4,None,None,None,None,None,None,
+1110,110,Granitic,Tahoe_Low_Severity_Fire.rot,PrescrF,None,None,1000000,0.0002,4,None,None,None,None,None,None,
+1111,111,Granitic,Tahoe_Skid_Trail.rot,Skid,None,None,2700000,0.00015,4,None,None,None,None,None,None,
+1112,112,Granitic,Tahoe_Young_Forest.rot,Yr1_Recov_Fire,None,None,400000,1.00E-04,4,None,None,None,None,None,None,
+1113,113,Granitic,Tahoe_Young_Forest.rot,Yr1_Recov_Thinn,None,None,400000,2.50E-03,4,None,None,None,None,None,None,
+1114,114,Granitic,Tahoe_Young_Forest.rot,Yr2_Recov_Fire,None,None,400000,2.00E-03,4,None,None,None,None,None,None,
+1115,115,Granitic,Cable_Thinning_93_Cover.man,Cable_Thinning,None,None,400000,1.50E-03,4,None,None,None,None,None,None,
+1116,116,Granitic,Forward_Thinning_90_Cover.man,Forward_Thinning,None,None,400000,0.00035,4,None,None,None,None,None,None,
+1117,117,Granitic,Skidder_Thinning_85_Cover.man,Skidder_Thinning,None,None,400000,0.00025,4,None,None,None,None,None,None,
+1118,118,Granitic,Tahoe_Moderate_Severity_Fire.rot,ModF,None,None,1000000,0.000175,4,None,None,None,None,None,None,
+1119,119,Granitic,Tahoe_Shrub_High_Severity_Fire.rot,HighFShrub,None,None,450000,1.50E-03,4,None,None,None,None,None,None,
+1120,120,Granitic,Tahoe_Shrub_Moderate_Severity_Fire.rot,ModFShrub,None,None,400000,1.00E-03,4,None,None,None,None,None,None,
+1121,121,Granitic,Tahoe_Shrub_Low_Severity_Fire.rot,LowFShrub,None,None,400000,1.00E-03,4,None,None,None,None,None,None,
+1122,122,Granitic,Tahoe_Shrub_Low_Severity_Fire.rot,PrescrShrub,None,None,350000,3.00E-04,4,None,None,None,None,None,None,
+1123,123,Granitic,Tahoe_Thinning_96_Cover.rot,Thinning_96_Cover,None,None,400000,0.0002,4,None,None,None,None,None,None,
+1124,124,Granitic,Tahoe_Thinning_75_Cover.rot,Thinning_75_Cover,None,None,400000,0.00015,4,None,None,None,None,None,None,
+2100,100,Volcanic,Tahoe_Bare_Slope.rot,Bare,None,None,750000,0.0015,1.5,None,None,None,None,None,None,
+2101,101,Volcanic,Tahoe_Sod_Grass.rot,Sod_G,None,None,1000000,1.00E-03,1.5,None,None,None,None,None,None,
+2102,102,Volcanic,Tahoe_Old_Forest.rot,OForst,None,None,300000,1.00E-03,1.5,None,None,None,None,None,None,
+2103,103,Volcanic,Tahoe_Bunch_Grass.rot,BnchG,None,None,900000,3.00E-04,1.5,None,None,None,None,None,None,
+2104,104,Volcanic,Tahoe_Shrub.rot,Shrub,None,None,600000,2.00E-04,1.5,None,None,None,None,None,None,
+2105,105,Volcanic,Tahoe_High_Severity_Fire.rot,HighF,None,None,2000000,0.00015,1.5,None,None,None,None,None,None,
+2106,106,Volcanic,Tahoe_Low_Severity_Fire.rot,LowF,None,None,1500000,0.00075,1.5,None,None,None,None,None,None,
+2107,107,Volcanic,Tahoe_Young_Forest.rot,YForst,None,None,500000,5.00E-04,1.5,None,None,None,None,None,None,
+2110,110,Volcanic,Tahoe_Low_Severity_Fire.rot,PrescrF,None,None,1500000,0.00025,1.5,None,None,None,None,None,None,
+2111,111,Volcanic,Tahoe_Skid_Trail.rot,Skid,None,None,600000,0.0015,1.5,None,None,None,None,None,None,
+2112,112,Volcanic,Tahoe_Young_Forest.rot,Yr1_Recov_Fire,None,None,700000,1.00E-03,1.5,None,None,None,None,None,None,
+2113,113,Volcanic,Tahoe_Young_Forest.rot,Yr1_Recov_Thinn,None,None,700000,1.00E-03,1.5,None,None,None,None,None,None,
+2114,114,Volcanic,Tahoe_Young_Forest.rot,Yr2_Recov_Fire,None,None,700000,2.00E-04,1.5,None,None,None,None,None,None,
+2115,115,Volcanic,Cable_Thinning_93_Cover.man,Cable_Thinning,None,None,500000,3.00E-04,1.5,None,None,None,None,None,None,
+2116,116,Volcanic,Forward_Thinning_90_Cover.man,Forward_Thinning,None,None,500000,0.00015,1.5,None,None,None,None,None,None,
+2117,117,Volcanic,Skidder_Thinning_85_Cover.man,Skidder_Thinning,None,None,500000,0.0015,1.5,None,None,None,None,None,None,
+2118,118,Volcanic,Tahoe_Moderate_Severity_Fire.rot,ModF,None,None,1500000,0.001,1.5,None,None,None,None,None,None,
+2119,119,Volcanic,Tahoe_Shrub_High_Severity_Fire.rot,HighFShrub,None,None,800000,7.50E-04,1.5,None,None,None,None,None,None,
+2120,120,Volcanic,Tahoe_Shrub_Moderate_Severity_Fire.rot,ModFShrub,None,None,700000,5.00E-03,1.5,None,None,None,None,None,None,
+2121,121,Volcanic,Tahoe_Shrub_Low_Severity_Fire.rot,LowFShrub,None,None,700000,4.00E-03,1.5,None,None,None,None,None,None,
+2122,122,Volcanic,Tahoe_Shrub_Low_Severity_Fire.rot,PrescrFShrub,None,None,700000,3.00E-03,1.5,None,None,None,None,None,None,
+2123,123,Volcanic,Tahoe_Thin_96_cover.rot,Thinning_96_Cover,None,None,500000,0.0002,1.5,None,None,None,None,None,None,
+2124,124,Volcanic,Tahoe_Thinning_75_Cover.rot,Thinning_75_Cover,None,None,500000,0.00015,1.5,None,None,None,None,None,None,
+3100,100,Alluvial,Tahoe_Bare_Slope.rot,Bare,None,None,600000,0.0001,1,None,None,None,None,None,None,
+3101,101,Alluvial,Tahoe_Sod_Grass.rot,Sod_G,None,None,600000,2.50E-03,1,None,None,None,None,None,None,
+3102,102,Alluvial,Tahoe_Old_Forest.rot,OForst,None,None,300000,2.50E-03,1,None,None,None,None,None,None,
+3103,103,Alluvial,Tahoe_Bunch_Grass.rot,BnchG,None,None,500000,2.00E-03,1,None,None,None,None,None,None,
+3104,104,Alluvial,Tahoe_Shrub.rot,Shrub,None,None,350000,1.50E-03,1,None,None,None,None,None,None,
+3105,105,Alluvial,Tahoe_High_Severity_Fire.rot,HighF,None,None,1500000,0.0002,1,None,None,None,None,None,None,
+3106,106,Alluvial,Tahoe_Low_Severity_Fire.rot,LowF,None,None,1000000,0.00015,1,None,None,None,None,None,None,
+3107,107,Alluvial,Tahoe_Young_Forest.rot,YForst,None,None,600000,1.00E-04,1,None,None,None,None,None,None,
+3110,110,Alluvial,Tahoe_Low_Severity_Fire.rot,PrescrF,None,None,1000000,0.0002,1,None,None,None,None,None,None,
+3111,111,Alluvial,Tahoe_Skid_Trail.rot,Skid,None,None,2500000,0.00015,1,None,None,None,None,None,None,
+3112,112,Alluvial,Tahoe_Young_Forest.rot,Yr1_Recov_Fire,None,None,600000,1.00E-04,1,None,None,None,None,None,None,
+3113,113,Alluvial,Tahoe_Young_Forest.rot,Yr1_Recov_Thinn,None,None,600000,1.00E-03,1,None,None,None,None,None,None,
+3114,114,Alluvial,Tahoe_Young_Forest.rot,Yr2_Recov_Fire,None,None,600000,7.50E-04,1,None,None,None,None,None,None,
+3115,115,Alluvial,Cable_Thinning_93_Cover.man,Cable_Thinning,None,None,600000,5.00E-04,1,None,None,None,None,None,None,
+3116,116,Alluvial,Forward_Thinning_90_Cover.man,Forward_Thinning,None,None,600000,0.0002,1,None,None,None,None,None,None,
+3117,117,Alluvial,Skidder_Thinning_85_Cover.man,Skidder_Thinning,None,None,600000,0.00015,1,None,None,None,None,None,None,
+3118,118,Alluvial,Tahoe_Moderate_Severity_Fire.rot,ModF,None,None,1000000,0.0001,1,None,None,None,None,None,None,
+3119,119,Alluvial,Tahoe_Shrub_High_Severity_Fire.rot,HighFShrub,None,None,450000,2.00E-04,1,None,None,None,None,None,None,
+3120,120,Alluvial,Tahoe_Shrub_Moderate_Severity_Fire.rot,ModFShrub,None,None,450000,1.50E-04,1,None,None,None,None,None,None,
+3121,121,Alluvial,Tahoe_Shrub_Low_Severity_Fire.rot,LowFShrub,None,None,450000,1.00E-04,1,None,None,None,None,None,None,
+3122,122,Alluvial,Tahoe_Shrub_Low_Severity_Fire.rot,PrescrShrub,None,None,400000,2.00E-04,1,None,None,None,None,None,None,
+3123,123,Alluvial,Tahoe_Thin_96_cover.rot,Thinning_96_Cover,None,None,600000,0.00015,1,None,None,None,None,None,None,
+3124,124,Alluvial,Tahoe_Thinning_75_Cover.rot,Thinning_75_Cover,None,None,600000,0.0001,1,None,None,None,None,None,None,