diff --git a/vic/drivers/shared_all/src/input_tools.c b/vic/drivers/shared_all/src/input_tools.c index 82e3d904f..6b6ef54dd 100644 --- a/vic/drivers/shared_all/src/input_tools.c +++ b/vic/drivers/shared_all/src/input_tools.c @@ -41,6 +41,7 @@ str_to_bool(char str[]) else { log_err("%s is neither TRUE nor FALSE", str); } + return false; // To avoid warnings. } /****************************************************************************** @@ -132,6 +133,7 @@ str_to_agg_type(char aggstr[]) log_err("Unknown aggregation type found: %s", aggstr); } } + return 0; // To avoid warnings. } /****************************************************************************** @@ -166,6 +168,7 @@ str_to_out_type(char typestr[]) log_err("Unknown out type found: %s", typestr); } } + return 0; // To avoid warnings. } /****************************************************************************** @@ -180,6 +183,7 @@ str_to_out_mult(char multstr[]) else { return (double) atof(multstr); } + return 0.; // To avoid warnings. } /****************************************************************************** @@ -221,6 +225,7 @@ str_to_freq_flag(char freq[]) else { log_err("Unknown frequency flag found: %s", freq); } + return 0; // To avoid warnings. } /****************************************************************************** @@ -273,6 +278,7 @@ str_to_calendar(char *cal_chars) else { log_err("Unknown calendar specified: %s", cal_chars); } + return 0; // To avoid warnings. } /****************************************************************************** @@ -297,6 +303,7 @@ str_to_timeunits(char units_chars[]) else { log_err("Unknown time units specified: %s", units_chars); } + return 0; // To avoid warnings. } /****************************************************************************** @@ -399,4 +406,5 @@ cell_method_from_agg_type(unsigned short int aggtype, else { return false; } + return false; // To avoid warnings. } diff --git a/vic/vic_run/src/CalcBlowingSnow.c b/vic/vic_run/src/CalcBlowingSnow.c index 6591f775a..09e39be3f 100644 --- a/vic/vic_run/src/CalcBlowingSnow.c +++ b/vic/vic_run/src/CalcBlowingSnow.c @@ -271,18 +271,18 @@ CalcBlowingSnow(double Dt, *****************************************************************************/ double qromb(double (*funcd)(), - double es, - double Wind, - double AirDens, - double ZO, - double EactAir, - double F, - double hsalt, - double phi_r, - double ushear, - double Zrh, - double a, - double b) + double es, + double Wind, + double AirDens, + double ZO, + double EactAir, + double F, + double hsalt, + double phi_r, + double ushear, + double Zrh, + double a, + double b) { extern parameters_struct param; @@ -305,6 +305,7 @@ qromb(double (*funcd)(), h[j + 1] = 0.25 * h[j]; } log_err("Too many steps"); + return 0.; // To avoid warnings. } /****************************************************************************** @@ -363,19 +364,19 @@ polint(double xa[], *****************************************************************************/ double trapzd(double (*funcd)(), - double es, - double Wind, - double AirDens, - double ZO, - double EactAir, - double F, - double hsalt, - double phi_r, - double ushear, - double Zrh, - double a, - double b, - int n) + double es, + double Wind, + double AirDens, + double ZO, + double EactAir, + double F, + double hsalt, + double phi_r, + double ushear, + double Zrh, + double a, + double b, + int n) { double x, tnm, sum, del; int it, j; @@ -409,6 +410,7 @@ trapzd(double (*funcd)(), s = 0.5 * (s + (b - a) * sum / tnm); return s; } + return 0.; // To avoid warnings. } /****************************************************************************** @@ -484,6 +486,7 @@ rtnewt(double x1, } } log_err("Maximum number of iterations exceeded"); + return 0.; // To avoid warnings. } /******************************************************************************