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 soilwat2 with co2 #51

Merged
merged 9 commits into from
Dec 14, 2017
Merged

Feature soilwat2 with co2 #51

merged 9 commits into from
Dec 14, 2017

Conversation

dschlaep
Copy link
Member

@dschlaep dschlaep commented Dec 7, 2017

Adjust code so that the CO2-enabled version of SOILWAT2 can be used as submodule (currently tracking the soilwat_co2_effects branch of SOILWAT2).

This PR compiles and the testing example runs well and produces output similar to the output generated by #50

- SOILWAT2 commit
DrylandEcology/SOILWAT2@2063e38643b7ad49c
e0eade239e8093886c7c123 cleaned up struct 'SW_VEGPROD':
* defined struct 'VegTypeOut' and 'CoverType'
- close DrylandEcology/SOILWAT2#99

- CO2 flags are turned off

- this commit compiles and executes the testing example
Copy link
Member

@kpalmqui kpalmqui left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR compiles properly. I tested with CO2 off and found no difference in the output (bmassavg.csv) or debugging output files between this PR and the master branch. Turning off the CO2 features within STEPWAT2 is fine for now. I will add an issue to STEPWAT2 to incorporate additional changes to make the CO2 code functional with STEPWAT2. For instance, we will need to add the carbon.in file to /Stepwat_Inputs/Input/sxw/Input.

@dschlaep
Copy link
Member Author

dschlaep commented Dec 7, 2017

Let's wait with merging the pull request into master until the corresponding soilwat_co2_effects branch of SOIILWAT2 is merged into master.

@dschlaep
Copy link
Member Author

dschlaep commented Dec 14, 2017

@kpalmqui Kyle, the 'CO2-effects' work on SOILWAT2 is completed. I updated this branch of STEPWAT2, compiled, and run the code to check for sensible outputs. It seems fine.

This branch is a pre-requisit for addressing issue #52.

@dschlaep dschlaep merged commit 35cc2b0 into master Dec 14, 2017
@dschlaep dschlaep deleted the feature_SOILWAT2_with_CO2 branch December 14, 2017 19:05
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