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

Let simulate_day do Pre-Columbian calculation. #37

Merged
merged 2 commits into from
Aug 10, 2015
Merged

Let simulate_day do Pre-Columbian calculation. #37

merged 2 commits into from
Aug 10, 2015

Conversation

jamesmcclain
Copy link
Member

The simulate_year function already had this ability. The definition of "Pre-Columbian" has also been changed: previously, anything other than "water", "herbaceous wetland", or "woody wetland" would be transformed into "mixed forest". Now, only built-types are transformed into "mixed forest".

My interpretation of earlier instructions was that anything other than the three types mentioned was to be turned into mixed forest. However, the statement of card #36 lists a number of built-types and says that all of them should be transformed into mixed forest -- I took the liberty of generalizing this to all built types.

Connects #36

@mmcfarland
Copy link
Contributor

I didn't anticipate the previous use of any but water/wetlands being converted to mixed forest. I'll clarify the approach with Stroud and see if they really would rather have only built use types converted instead.

@jamesmcclain
Copy link
Member Author

Okay, sounds good.

@mmcfarland
Copy link
Contributor

Barry recommends:

all "non-natural" land cover types [changed] to mixed forest, including all "developed", "agricultural", and "disturbed (e.g., mining, quarries, etc.)" land. Anything like wetlands, shrub/brush land, prairie, grassland, forest, etc., I would leave as is.

The simulate_year function already had this ability.  The definition of
"Pre-Columbian" has also been changed: previously, anything other than
"water", "herbaceous wetland", or "woody wetland" would be transformed
into "mixed forest".  Now, only built-types are transformed into "mixed
forest".

Connects #36
@jamesmcclain
Copy link
Member Author

Okay, I made a change to implement Barry's recommendation.

I have also moved the precolumbian parameter back onto simulate_water_quality and simulate_modifications, undoing an earlier change. It was an error to make that change because it did not allow the Pre-Columbian state to be applied to the water quality calculation. I have expanded the tests to catch this.

@mmcfarland
Copy link
Contributor

Looks good, can you add a section to the README that describes the parameter and the technical meaning of it in our implementation?

Update: Looks like it exists, but we just need to update the technical description which is now outdated.

@mmcfarland
Copy link
Contributor

+1

@mmcfarland mmcfarland assigned jamesmcclain and unassigned mmcfarland Aug 7, 2015
jamesmcclain pushed a commit that referenced this pull request Aug 10, 2015
Let simulate_day do Pre-Columbian calculation.
@jamesmcclain jamesmcclain merged commit 2ac761e into WikiWatershed:develop Aug 10, 2015
@jamesmcclain jamesmcclain deleted the feature/precolumbian branch August 10, 2015 13:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants