Merge pull request #6 from Burke-Lauenroth-Lab/wrapper_sw31

Merge our current 'de-facto' master branch 'wrapper_sw31' into 'master' Former-commit-id: 8878b16325332f9d477698b62e85b232ebe3ceba [formerly 95580d3171feec33c9a1fb5312c714a412ccaf67] Former-commit-id: debeb97
DrylandEcology · Jul 28, 2016 · 3e062ef · 3e062ef
2 parents 81d0b6e + e6a47b1
commit 3e062ef
Show file tree

Hide file tree

Showing 221 changed files with 20,282 additions and 33,666 deletions.
diff --git a/1_Data_SWInput/Rsoilwat/Rsoilwat_v27.tar.gz b/1_Data_SWInput/Rsoilwat/Rsoilwat_v27.tar.gz
diff --git a/1_Data_SWInput/SWRuns_InputData_ExperimentalDesign_v03.csv b/1_Data_SWInput/SWRuns_InputData_ExperimentalDesign_v03.csv
diff --git a/1_Data_SWInput/SWRuns_InputData_ExperimentalDesign_v04.csv b/1_Data_SWInput/SWRuns_InputData_ExperimentalDesign_v04.csv
@@ -0,0 +1,2 @@
+Label,sw,filesin,prodin,siteparamin,soilsin,weathersetupin,cloudin,YearStart,YearEnd,LookupWeatherFolder,LookupClimateTempScenarios,LookupClimatePPTScenarios,LookupShiftedPPTScenarios,LookupShiftedPPTCategory,LookupSnowDensityFromTable,LookupTranspRegionsFromTable,LookupEvapCoeffFromTable,LookupTranspCoeffFromTable_Grass,LookupTranspCoeffFromTable_Shrub,LookupTranspCoeffFromTable_Tree,LookupTranspCoeffFromTable_Forb,PotentialNaturalVegetation_CompositionShrubsC3C4_Paruelo1996,PotentialNaturalVegetation_CompositionShrubs_Fraction,PotentialNaturalVegetation_CompositionC3_Fraction,PotentialNaturalVegetation_CompositionC4_Fraction,PotentialNaturalVegetation_CompositionAnnuals_Fraction,PotentialNaturalVegetation_CompositionForb_Fraction,PotentialNaturalVegetation_CompositionBareGround_Fraction,AdjMonthlyBioMass_Precipitation,AdjMonthlyBioMass_Temperature,AdjRootProfile,RootProfile_C3,RootProfile_C4,RootProfile_Annuals,RootProfile_Shrubs,RootProfile_Forb,Shrub_TotalBiomass_ScalingFactor,Shrub_LiveBiomass_ScalingFactor,Shrub_Litter_ScalingFactor,Grass_TotalBiomass_ScalingFactor,Grass_LiveBiomass_ScalingFactor,Grass_Litter_ScalingFactor,Tree_TotalBiomass_ScalingFactor,Tree_LiveBiomass_ScalingFactor,Tree_Litter_ScalingFactor,Forb_TotalBiomass_ScalingFactor,Forb_LiveBiomass_ScalingFactor,Forb_Litter_ScalingFactor,Vegetation_Biomass_ScalingSeason_AllGrowingORNongrowing,Vegetation_Height_ScalingFactor,PotentialNaturalVegetation_Composition_basedOnReferenceOrScenarioClimate,ClimateScenario_Temp_PerturbationInMeanSeasonalityBothOrNone,ClimateScenario_PPT_PerturbationInMeanSeasonalityBothOrNone,RunoffPercent_fromPondedWater,Imperm_L1,Exclude_ClimateAmbient,Grass_HydRed_OnOff,Shrub_HydRed_OnOff,Tree_HydRed_OnOff,Forb_HydRed_OnOff,MaxTempDepth
+UseInformationToCreateSoilWatRuns,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/...t/SWRuns_InputData_SoilLayers_WISE_v9.csv → ...WInput/SWRuns_InputData_SoilLayers_v9.csv b/...t/SWRuns_InputData_SoilLayers_WISE_v9.csv → ...WInput/SWRuns_InputData_SoilLayers_v9.csv
diff --git a/1_Data_SWInput/SWRuns_InputData_TreatmentDesign_v14.csv b/1_Data_SWInput/SWRuns_InputData_TreatmentDesign_v14.csv
@@ -1,3 +1,2 @@
-Label,sw,filesin,prodin,siteparamin,soilsin,weathersetupin,cloudin,YearStart,YearEnd,LookupWeatherFolder,LookupClimateTempScenarios,LookupClimatePPTScenarios,LookupShiftedPPTScenarios,LookupShiftedPPTCategory,LookupSnowDensityFromTable,LookupTranspRegionsFromTable,LookupEvapCoeffFromTable,LookupTranspCoeffFromTable_Grass,LookupTranspCoeffFromTable_Shrub,LookupTranspCoeffFromTable_Tree,PotentialNaturalVegetation_CompositionShrubsC3C4_Paruelo1996,PotentialNaturalVegetation_CompositionShrubs_Fraction,PotentialNaturalVegetation_CompositionC3_Fraction,PotentialNaturalVegetation_CompositionC4_Fraction,PotentialNaturalVegetation_CompositionAnnuals_Fraction,AdjMonthlyBioMass_Precipitation,AdjMonthlyBioMass_Temperature,AdjRootProfile,RootProfile_C3,RootProfile_C4,RootProfile_Annuals,RootProfile_Shrubs,Shrub_TotalBiomass_ScalingFactor,Shrub_LiveBiomass_ScalingFactor,Shrub_Litter_ScalingFactor,Grass_TotalBiomass_ScalingFactor,Grass_LiveBiomass_ScalingFactor,Grass_Litter_ScalingFactor,Tree_TotalBiomass_ScalingFactor,Tree_LiveBiomass_ScalingFactor,Tree_Litter_ScalingFactor,Vegetation_Biomass_ScalingSeason_AllGrowingORNongrowing,Vegetation_Height_ScalingFactor,PotentialNaturalVegetation_Composition_basedOnReferenceOrScenarioClimate,ClimateScenario_Temp_PerturbationInMeanSeasonalityBothOrNone,ClimateScenario_PPT_PerturbationInMeanSeasonalityBothOrNone,Exclude_ClimateAmbient
-UseInformationToCreateSoilWatRuns,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-00133_StudyDelineation,,,sbe_prod_v21.in,,soils_sandyloam_v23.in,,,,,Weather_NCEPCFSR_-52.298--70.313,,,,,Prairie,,,ShortgrassSteppe_MeanOf_Liang1989Singh1998_WeightedByShrub_cm,BigSagebrushEcosystem_cm,FILL,1,0.5,NA,NA,0,1,1,1,SchenkJackson2003_PCdry_grasses,SchenkJackson2003_PCdry_grasses,Jacksonetal1996_crops,SchenkJackson2003_PCdry_shrubs,,,,,,,0.5,0.5,0.5,All,0.5,Reference,both,both,1
+Label,sw,filesin,prodin,siteparamin,soilsin,weathersetupin,cloudin,YearStart,YearEnd,LookupWeatherFolder,LookupClimateTempScenarios,LookupClimatePPTScenarios,LookupShiftedPPTScenarios,LookupShiftedPPTCategory,LookupSnowDensityFromTable,LookupTranspRegionsFromTable,LookupEvapCoeffFromTable,LookupTranspCoeffFromTable_Grass,LookupTranspCoeffFromTable_Shrub,LookupTranspCoeffFromTable_Tree,LookupTranspCoeffFromTable_Forb,PotentialNaturalVegetation_CompositionShrubsC3C4_Paruelo1996,PotentialNaturalVegetation_CompositionShrubs_Fraction,PotentialNaturalVegetation_CompositionC3_Fraction,PotentialNaturalVegetation_CompositionC4_Fraction,PotentialNaturalVegetation_CompositionAnnuals_Fraction,PotentialNaturalVegetation_CompositionForb_Fraction,PotentialNaturalVegetation_CompositionBareGround_Fraction,AdjMonthlyBioMass_Precipitation,AdjMonthlyBioMass_Temperature,AdjRootProfile,RootProfile_C3,RootProfile_C4,RootProfile_Annuals,RootProfile_Shrubs,RootProfile_Forbs,Shrub_TotalBiomass_ScalingFactor,Shrub_LiveBiomass_ScalingFactor,Shrub_Litter_ScalingFactor,Grass_TotalBiomass_ScalingFactor,Grass_LiveBiomass_ScalingFactor,Grass_Litter_ScalingFactor,Tree_TotalBiomass_ScalingFactor,Tree_LiveBiomass_ScalingFactor,Tree_Litter_ScalingFactor,Forb_TotalBiomass_ScalingFactor,Forb_LiveBiomass_ScalingFactor,Forb_Litter_ScalingFactor,Vegetation_Biomass_ScalingSeason_AllGrowingORNongrowing,Vegetation_Height_ScalingFactor,PotentialNaturalVegetation_Composition_basedOnReferenceOrScenarioClimate,ClimateScenario_Temp_PerturbationInMeanSeasonalityBothOrNone,ClimateScenario_PPT_PerturbationInMeanSeasonalityBothOrNone,Exclude_ClimateAmbient,MaxTempDepth
+UseInformationToCreateSoilWatRuns,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/1_Data_SWInput/SWRuns_InputMaster_TemperateArid_v11.csv b/1_Data_SWInput/SWRuns_InputMaster_TemperateArid_v11.csv
diff --git a/1_Data_SWInput/SWRuns_InputMaster_YOURPROJECT_v11.csv b/1_Data_SWInput/SWRuns_InputMaster_YOURPROJECT_v11.csv
@@ -0,0 +1,2 @@
+Label,site_id,Region,WeatherFolder,X_WGS84,Y_WGS84,ELEV_m,ASPECT,SLOPE,Include_YN
+00133_StudyDelineation,133,1,Weather_NCEPCFSR_-52.298--70.313,-70.3125,-52.34375,199,,,1