Merge master into feature_space #263
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Try UI.
…ubset of functional groups has been back
Master branch updates into Fire_testing
merging master into Fire_testing
Each wildfire and prescribed fire output column will now contain the number of fires that occurred that year as an integer value.
I have removed the repeated lines in rgroup.in and modified ST_params.c accordingly. I also removed the "name" parameter for cheatgrass parameters because we are using one line to define the parameter for all groups.
This function is not necessary when STEPWAT2 is run with SOILWAT2, and we do not plan on running STEPWAT2 without SOILWAT2 anymore.
We now expect to always use SOILWAT2 to calculate resources. With this in mind, I removed the variable UseSoilwat. Wherever it was used, I treated the code as if UseSoilwat was TRUE, and modified it accordingly. Because we will always be using SOILWAT from now on, I also removed the -s option on startup. This is equivalent to always including the -s flag.
This flag is no longer necessary because STEPWAT2 will always use SOILWAT2 to drive the water cycle from now on.
The switch/case statement in init_args has not been properly updated to reflect the removal of the -s flag. The index values were off, which meant that the -o flag was being replaced with the -g flag.
The testing options built in to the makefile now reflect the removal of the -s flag.
This commit will reset fire_possibility to 1 if it exceeds 1.
- added comments to describe rgroup_Extirpate and Rgroup_Kill
…sue #219 - added comments to clarify what the parameters represent - added a source for where these values came from
This function no longer exists.
- updated descriptions of key fire parameters and clarified that the three fire options are mutually exclusive. - set killfreq_staryr to 0 as default (fire off).
* removed commented out print statements * removed _get_sum function because it is no longer relevant * removed variable g because it is unused * changed some comments as directed by Dr. Palmquist.
This flag now does nothing other than telling the user that it is deprecated.
Both warnings were for unused variables. rg was removed entirely and r is now only defined if DEBUG_ENVCONST is defined.
I moved the assignment of RGroup[rg]->use_mort from _rgroup_add_disturbance to _rgroup_add1 because mort is not considered a disturbance. Most other changes are comments.
* Removed one comment * Removed ifdef STEPWAT block because it is deprecated.
…sity Changing the default parameters for proportion recovery and grazing intensity, as these were changed at some point in this branch and did not represent the default settings we want to simulate.
The problem was my use of g->killfreq to determine if wildire or prescribed fire should be run. To fix this, I made a new boolean that checks ALL rgroup-killfreqs to determine if wildfire or prescribed fire should be simulated.
Since we are now using SOILWAT exclusively for weather generation we do not need the references to #ifdef STEPWAT. I removed this logic and treated the affected code as if STEPWAT is always defined. I also tried to remove the compiler flag `-DSTEPWAT` but SOILWAT still needs the definition to determine if it is running on it's own or in the context of STEPWAT.
in README.md: reverted some comments so that they reference SOILWAT. in ST_environs.c: added back two assignments that should not have been removed with #ifdef STEPWAT in ST_main.c: completely removed -s flag. Using the -s flag will now throw an error.
Fire testing
Merge master into remove_resource_ppt
Remove resource ppt
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Master now contains the Fire_testing and remove_resource_ppt branches.