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

Update SOILWAT2 to be compatible with gridded_code branch of STEPWAT2 #247

Closed
chaukap opened this issue Apr 17, 2019 · 4 comments
Closed
Assignees
Labels
Bugfix Used for pull requests to signify the merging branch is a bug fix. high priority

Comments

@chaukap
Copy link
Contributor

chaukap commented Apr 17, 2019

While updating STEPWAT2's gridded code I changed the variable Globals to a pointer. There is one reference to Globals in setGlobalSTEPWAT2_OutputVariables() in SW_Output_outarray.c that needs to be updated.

Globals.runModelYears to Globals->runModelYears
@chaukap chaukap added high priority Bugfix Used for pull requests to signify the merging branch is a bug fix. labels Apr 17, 2019
@chaukap chaukap self-assigned this Apr 17, 2019
chaukap pushed a commit that referenced this issue Apr 17, 2019
@chaukap
Copy link
Contributor Author

chaukap commented Apr 17, 2019

The first build of 28f5cfa failed, but the rebuild succeeded. Looks like #210 was the culprit.

@chaukap
Copy link
Contributor Author

chaukap commented Apr 17, 2019

This is the only change I needed to make. Unfortunately merging this into master right now would break STEPWAT2's master branch. I will therefore leave this open until the gridded_code milestone in STEPWAT is complete.

@dschlaep if you would like me to close the milestone or issue let me know, I feel bad about cluttering the repo with such a minor change.

@dschlaep
Copy link
Member

@chaukap Sounds good. Not much of a problem. Feel free to create a pull-request though (with above explanation) to mark that this is ready to go once the STEPWAT2-side is -- at least for me, PRs are more visible and I am l less likely to forget about them when they are becoming stale...

@chaukap
Copy link
Contributor Author

chaukap commented Apr 24, 2019

I identified one more problem: we are changing SXW to a pointer and there are a few places in SOILWAT that reference SXW. I will change these to pointers as well. Everything is still inside an #ifdef STEPWAT so this should not change SOILWAT.

chaukap pushed a commit that referenced this issue Apr 24, 2019
In the gridded_code branch of STEPWAT2 we have changes SXW to a pointer. This commit reflects that change.
chaukap pushed a commit that referenced this issue Jun 5, 2019
SuperGlobals is a new STEPWAT2 struct that holds Global variabls that are not cell-specific. This includes runModelYears and runModelIterations. To account for this I had to extern the new variable and modify the calls.
(issue #247)
@chaukap chaukap closed this as completed Dec 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bugfix Used for pull requests to signify the merging branch is a bug fix. high priority
Projects
None yet
Development

No branches or pull requests

2 participants