From 4f03e2ce804f91da17ccac0beac83a3efdf594cd Mon Sep 17 00:00:00 2001 From: dschlaep Date: Tue, 5 Dec 2017 10:23:07 -0500 Subject: [PATCH 1/2] Delete unused global variable - 'Old_SW_VegProd' is unused - close #92 --- SW_VegProd.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/SW_VegProd.c b/SW_VegProd.c index e44db947b..9012a5cf9 100644 --- a/SW_VegProd.c +++ b/SW_VegProd.c @@ -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 */ @@ -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; From 7d5eee8c8df2c135af098f1399d569c659d9b9cc Mon Sep 17 00:00:00 2001 From: dschlaep Date: Tue, 5 Dec 2017 10:47:18 -0500 Subject: [PATCH 2/2] Eliminate compile warnings - eliminate compile warnings * warning: assignment makes integer from pointer without a cast [-Wint-conversion] --- SW_Output.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SW_Output.c b/SW_Output.c index 22986b9d4..dca0c6c95 100644 --- a/SW_Output.c +++ b/SW_Output.c @@ -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; }