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.

Sign up for GitHub

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

Jump to bottom

Bugfix 92 #97

Merged
merged 2 commits into from
Dec 5, 2017
Merged

Bugfix 92 #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f03e2c
Delete unused global variable
dschlaep Dec 5, 2017
7d5eee8
Eliminate compile warnings
dschlaep Dec 5, 2017
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
4 changes: 2 additions & 2 deletions SW_Output.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3818,8 +3818,8 @@ static void sumof_ves(SW_VEGESTAB *v, SW_VEGESTAB_OUTPUTS *s, OutKey k)

tmp1 = (int) v->count + (int) k;
tmp1 += tmp1;
tmp2 = (TimeInt) s->days;
tmp2 += tmp2;
tmp2 = *(s->days);
tmp2 = tmp2;
return;
}

Expand Down
4 changes: 1 addition & 3 deletions SW_VegProd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ extern Bool EchoInits;
extern Bool collectInData;
#endif
SW_VEGPROD SW_VegProd; /* declared here, externed elsewhere */
SW_VEGPROD Old_SW_VegProd; /* declared here for reading old value of file sbe_prod_v31, externed elsewhere */

/* =================================================== */
/* Module-Level Variables */
Expand Down Expand Up @@ -539,9 +538,8 @@ void SW_VPD_read(void) {

if (EchoInits)
_echo_inits();
//save original copy of SW_VegProd at oldSW_VegProd before it getting updated in code flow
Old_SW_VegProd = SW_VegProd;
}

#ifdef RSOILWAT
SEXP onGet_SW_VPD() {
int i;
Expand Down