Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature overhaul aggregation code (part1) #268

Open
wants to merge 65 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
cd0e9e4
Adding new settings 'agg_funs' and 'agg_years'
Sep 9, 2016
31ec85b
New functions: circular median, mad, and quantiles
Sep 9, 2016
99a1188
Processing and testing new options 'agg_funs' and 'agg_years'
Sep 9, 2016
01cb072
Adding new tables to output for aggregation functions and time windows
Sep 9, 2016
978369b
Remove ensembles
Sep 9, 2016
dad63c0
Renamed local variable in do_OneSite()
Sep 9, 2016
00e2534
Cleaner code to access weather data from db within 'do_OneSite'
Sep 9, 2016
af65597
Bug fix to GISSM
Sep 9, 2016
3d4d3be
Fix commit to access weather db
Sep 9, 2016
d5967ef
Renamed functions with names xxx.xxx to xxx_xxx
Sep 12, 2016
93b3a89
Added new function 'create_aggregation_function'
Sep 12, 2016
fab4178
Cleaning up: e.g., adding 'median' to the list of aggregation functio…
Sep 12, 2016
9bf030f
Added type of aggregation to table 'aggregating_functions'
Sep 12, 2016
cd9cba8
Function 'create_aggregation_function' gains argument 'return_ids'
Sep 12, 2016
ac71a21
Fix to creating output DB table 'aggregating_functions'
Sep 12, 2016
27e390d
Fix bug in determining 'agg_fun_defs'
Sep 14, 2016
41625be
returned function/closure of 'create_aggregation_function' gains argu…
Sep 14, 2016
4018880
fixing dots argument in aggregating functions produced by 'create_agg…
Sep 14, 2016
c3ea64e
Working on implementing 'agg_fun' aggregations (part 1)
Sep 14, 2016
d450d2e
Adding new settings 'agg_funs' and 'agg_years'
Sep 9, 2016
87723e0
New functions: circular median, mad, and quantiles
Sep 9, 2016
d869614
Processing and testing new options 'agg_funs' and 'agg_years'
Sep 9, 2016
58a49ea
Adding new tables to output for aggregation functions and time windows
Sep 9, 2016
42df775
Remove ensembles
Sep 9, 2016
b0b6d58
Renamed functions with names xxx.xxx to xxx_xxx
Sep 12, 2016
dcd2abe
Added new function 'create_aggregation_function'
Sep 12, 2016
70361e8
Cleaning up: e.g., adding 'median' to the list of aggregation functio…
Sep 12, 2016
0ac92c4
Added type of aggregation to table 'aggregating_functions'
Sep 12, 2016
b036bad
Function 'create_aggregation_function' gains argument 'return_ids'
Sep 12, 2016
524f1d8
Fix to creating output DB table 'aggregating_functions'
Sep 12, 2016
054393e
Fix bug in determining 'agg_fun_defs'
Sep 14, 2016
3521a0d
returned function/closure of 'create_aggregation_function' gains argu…
Sep 14, 2016
25321ea
fixing dots argument in aggregating functions produced by 'create_agg…
Sep 14, 2016
083c98c
Working on implementing 'agg_fun' aggregations (part 1)
Sep 14, 2016
39cec37
Merge/rebase branch 'master' into generalized_agg_funs
Sep 14, 2016
4badeec
Fix merge mistake in aggregation 'yearlymonthlyTemperateDrylandIndices'
Sep 14, 2016
fd376ba
function 'sw_dailyC4_TempVar' gains argument 'return_yearly'
Sep 15, 2016
56ea744
Working on implementing 'agg_fun' aggregations (part 2)
Sep 16, 2016
0399473
Merge branch 'master' into generalized_agg_funs
Sep 18, 2016
c611b59
Working on implementing 'agg_fun' aggregations (part 3)
Sep 19, 2016
0c77165
Merge branch 'master' into generalized_agg_funs
Sep 21, 2016
a878447
Working on implementing 'agg_fun' aggregations (part 4)
Sep 22, 2016
cd03505
Merge branch 'master' into generalized_agg_funs
Sep 25, 2016
2d8e0f7
Working on implementing 'agg_fun' aggregations (part 5)
Sep 28, 2016
05f47ce
Merge branch 'master' into generalized_agg_funs
Sep 30, 2016
a37cc3f
untracked files on generalized_agg_funs: 48694c0 Merge branch 'master…
Oct 1, 2016
dcb6e0a
index on generalized_agg_funs: 48694c0 Merge branch 'master' into gen…
Oct 1, 2016
f198efc
WIP on generalized_agg_funs: 48694c0 Merge branch 'master' into gener…
Oct 1, 2016
46af060
Merge branch 'master' into generalized_agg_funs
Oct 9, 2016
6b641e7
Working on implementing 'agg_fun' aggregations (part 6)
Oct 9, 2016
8e4d1dc
Merge commit 'stash@{2}' into generalized_agg_funs
Oct 11, 2016
588dc0f
Merge branch 'master' into generalized_agg_funs
Oct 21, 2016
9b579fe
Merge branch 'master' into generalized_agg_funs
Nov 2, 2016
e31b45b
Attempt to merge with master before merging into package
Feb 27, 2017
0b124fa
Merge branch 'master' into generalized_agg_funs
Feb 28, 2017
4c5fb25
Merge branch 'generalized_agg_funs' into generalized_agg_funs2
Feb 28, 2017
265d9b2
Manually complete the merge with branch 'generalized_agg_funs'
Mar 1, 2017
15fd4aa
Merge branch 'move_more_code_to_functions' into generalized_agg_funs2
Mar 8, 2017
16a4d80
Clean up after last merge
Mar 9, 2017
c159d48
Merge branch 'master' into generalized_agg_funs2
Mar 15, 2017
f09af62
Fix various small errors
Mar 17, 2017
be9eb61
Merge branch 'master' into generalized_agg_funs2
dschlaep Jun 6, 2017
0b01e73
Merge branch 'master' into generalized_agg_funs2
dschlaep Aug 12, 2017
f6aa1f9
Merge branch 'master' into feature_OverhaulAggregationCode
dschlaep Feb 8, 2018
17c79e3
Fixed several compile time erros but several still exist, package sti…
nip5 May 23, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions 1_Data_SWInput/SWRuns_InputData_ExperimentalDesign_v07.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
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,LookupCarbonScenarios,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,RunonPercent_fromPondedWater,Imperm_L1,Exclude_ClimateAmbient,Grass_HydRed_OnOff,Shrub_HydRed_OnOff,Tree_HydRed_OnOff,Forb_HydRed_OnOff,SoilTemp_deltaX_cm,SoilTemp_MaxDepth_cm,PET_multiplier,Grass_SWPcrit_MPa,Shrub_SWPcrit_MPa,Tree_SWPcrit_MPa,Forb_SWPcrit_MPa,UseCO2BiomassMultiplier,UseCO2WUEMultiplier,SoilTemp_Flag
UseInformationToCreateSoilWatRuns,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,1,1,1,1,1,1,0,0,0,0,0,0,1,1,1,1,1,1,1,1,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,1,1,1,1,1,1,1,1,1,1
DefaultSettings,,,,,,,,,,,,,,,Prairie,CONUSSOIL_BSE_EVERY10cm,,SchenkJackson2003_PCdry_grasses,SchenkJackson2003_PCdry_shrubs,FILL,SchenkJackson2003_PCdry_forbs,FILL,1,,,,,,,1,1,1,1,1,1,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,15,990,1,-3.5,-3.9,-2,-2,1,1,0
1 change: 1 addition & 0 deletions 1_Data_SWInput/SWRuns_InputData_SoilLayers_v9.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Label,SoilDepth_cm,depth_L1,depth_L2,depth_L3,depth_L4,depth_L5,depth_L6,depth_L7,depth_L8,depth_L9,depth_L10,depth_L11,depth_L12,depth_L13,depth_L14,depth_L15,depth_L16,depth_L17,depth_L18,depth_L19,depth_L20
2 changes: 2 additions & 0 deletions 1_Data_SWInput/SWRuns_InputData_TreatmentDesign_v15.csv
Original file line number Diff line number Diff line change
@@ -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,LookupCarbonScenarios,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,UseCO2BiomassMultiplier,UseCO2WUEMultiplier
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
1 change: 1 addition & 0 deletions 1_Data_SWInput/SWRuns_InputMaster_YOURPROJECT_v11.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Label,site_id,Region,WeatherFolder,X_WGS84,Y_WGS84,ELEV_m,ASPECT,SLOPE,Include_YN
18 changes: 18 additions & 0 deletions 1_Data_SWInput/SoilWat2_defaults/Input/bouteloua.estab
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
bogr # 4-char name of species
# soil layer parameters
2 # number of layers affecting establishment
10. # SWP (bars) requirement for germination (top layer)
15. # SWP (bars) requirement for establishment (average of top layers)
# timing parameters in days
60 # first possible day of germination
180 # last possible day of germination
2 # min number of consecutive "wet" days for germination to occur
40 # max number of consecutive "dry" days after germination allowing estab
5 # min number of consecutive "wet" days after germination before establishment
15 # min number of days between germination and establishment
75 # max number of days between germination and establishment
# temperature parameters in C
5. # min temp threshold for germination
20. # max temp threshold for germination
0. # min temp threshold for establishment
20. # max temp threshold for establishment
18 changes: 18 additions & 0 deletions 1_Data_SWInput/SoilWat2_defaults/Input/bromus.estab
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
brte # 4-char name of species
# soil layer parameters
3 # number of layers affecting establishment - 45 cm Harris and Hulbert
10. # SWP (bars) requirement for germination (top layer) - Harris
15. # SWP (bars) requirement for establishment (average of top layers) - Harris
# timing parameters in days
200 # first possible day of germination - Hulbert and Harris
365 # last possible day of germination - Hulbert
6 # min number of consecutive "wet" days for germination to occur - Hurlbert and Harris
45 # max number of consecutive "dry" days after germination allowing estab - Harris (longtime)
6 # min number of consecutive "wet" days after germination before establishment - Harris
15 # min number of days between germination and establishment - Hulbert
90 # max number of days between germination and establishment - Harris and Hulbert
# temperature parameters in C
10. # min temp threshold for germination - Hulbert and Harris
30. # max temp threshold for germination - Hulbert and Harris
3. # min temp threshold for establishment - Harris
30. # max temp threshold for establishment - Harris and Hulbert
Loading