Fix uninitialized variable bug and drop dead code

include/PEtAerodynamicMethod.h

@@ -15,9 +15,7 @@ double pevapotranspiration_aerodynamic_method(pet_model *model)
 {
   // local varibles
   double psychrometric_constant_Pa_per_C;
-  double slope_sat_vap_press_curve_Pa_s;
   double moist_air_density_kg_per_m3;
-  double water_latent_heat_of_vaporization_J_per_kg;
   double moist_air_gas_constant_J_per_kg_K;
   double vapor_pressure_deficit_Pa;
   double liquid_water_density_kg_per_m3;
@@ -28,11 +26,9 @@ double pevapotranspiration_aerodynamic_method(pet_model *model)
   calculate_intermediate_variables(model);
 
   liquid_water_density_kg_per_m3 = model->inter_vars.liquid_water_density_kg_per_m3;
-  water_latent_heat_of_vaporization_J_per_kg=model->inter_vars.water_latent_heat_of_vaporization_J_per_kg;
   vapor_pressure_deficit_Pa=model->inter_vars.vapor_pressure_deficit_Pa;
   moist_air_gas_constant_J_per_kg_K=model->inter_vars.moist_air_gas_constant_J_per_kg_K;
   moist_air_density_kg_per_m3=model->inter_vars.moist_air_density_kg_per_m3;
-  slope_sat_vap_press_curve_Pa_s=model->inter_vars.slope_sat_vap_press_curve_Pa_s;
   psychrometric_constant_Pa_per_C=model->inter_vars.psychrometric_constant_Pa_per_C;
 
   if( model->pet_options.use_penman_monteith_method == FALSE)  // we don't use this term in Penman-Monteith method

include/PEtCombinationMethod.h

@@ -17,7 +17,6 @@ double pevapotranspiration_combination_method(pet_model *model)
   double slope_sat_vap_press_curve_Pa_s;
   double moist_air_density_kg_per_m3;
   double water_latent_heat_of_vaporization_J_per_kg;
-  double moist_air_gas_constant_J_per_kg_K;
   double vapor_pressure_deficit_Pa;
   double liquid_water_density_kg_per_m3;
   double lambda_pet;
@@ -32,9 +31,7 @@ double pevapotranspiration_combination_method(pet_model *model)
   calculate_intermediate_variables(model);
 
   liquid_water_density_kg_per_m3 = model->inter_vars.liquid_water_density_kg_per_m3;
-  water_latent_heat_of_vaporization_J_per_kg=model->inter_vars.water_latent_heat_of_vaporization_J_per_kg;
   vapor_pressure_deficit_Pa=model->inter_vars.vapor_pressure_deficit_Pa;
-  moist_air_gas_constant_J_per_kg_K=model->inter_vars.moist_air_gas_constant_J_per_kg_K;
   moist_air_density_kg_per_m3=model->inter_vars.moist_air_density_kg_per_m3;
   slope_sat_vap_press_curve_Pa_s=model->inter_vars.slope_sat_vap_press_curve_Pa_s;
   water_latent_heat_of_vaporization_J_per_kg=model->inter_vars.water_latent_heat_of_vaporization_J_per_kg;
@@ -43,8 +40,6 @@ double pevapotranspiration_combination_method(pet_model *model)
   delta=slope_sat_vap_press_curve_Pa_s;
   gamma=psychrometric_constant_Pa_per_C;
 
-  if(model->pet_options.use_combination_method==TRUE)
-    lambda_pet=0.0;
   if( (model->pet_options.use_aerodynamic_method == FALSE ) && (model->pet_options.use_penman_monteith_method==FALSE) )
   {
     // This is equation 3.5.9 from Chow, Maidment, and Mays textbook.

include/PEtEnergyBalanceMethod.h

@@ -34,7 +34,6 @@ double pevapotranspiration_energy_balance_method(pet_model *model)
   // We need this in all options except for aerodynamic or Penman-Monteith methods.
   // Radiation balance is the simplest method.  Involves only radiation calculations, no aerodynamic calculations.
 
-  lambda_pet=0.0;
   if( (model->pet_options.use_aerodynamic_method == FALSE ) && (model->pet_options.use_penman_monteith_method==FALSE) )
   {
     // This is equation 3.5.9 from Chow, Maidment, and Mays textbook.

include/PEtPenmanMonteithMethod.h

@@ -28,7 +28,6 @@ double pevapotranspiration_penman_monteith_method(pet_model *model)
   double slope_sat_vap_press_curve_Pa_s;
   double moist_air_density_kg_per_m3;
   double water_latent_heat_of_vaporization_J_per_kg;
-  double moist_air_gas_constant_J_per_kg_K;
   double moist_air_specific_humidity_kg_per_m3;
   double vapor_pressure_deficit_Pa;
   double liquid_water_density_kg_per_m3;
@@ -39,9 +38,7 @@ double pevapotranspiration_penman_monteith_method(pet_model *model)
   calculate_intermediate_variables(model);
 
   liquid_water_density_kg_per_m3 = model->inter_vars.liquid_water_density_kg_per_m3;
-  water_latent_heat_of_vaporization_J_per_kg=model->inter_vars.water_latent_heat_of_vaporization_J_per_kg;
   vapor_pressure_deficit_Pa=model->inter_vars.vapor_pressure_deficit_Pa;
-  moist_air_gas_constant_J_per_kg_K=model->inter_vars.moist_air_gas_constant_J_per_kg_K;
   moist_air_density_kg_per_m3=model->inter_vars.moist_air_density_kg_per_m3;
   slope_sat_vap_press_curve_Pa_s=model->inter_vars.slope_sat_vap_press_curve_Pa_s;
   water_latent_heat_of_vaporization_J_per_kg=model->inter_vars.water_latent_heat_of_vaporization_J_per_kg;

include/PEtPriestleyTaylorMethod.h

@@ -15,11 +15,8 @@ double pevapotranspiration_priestley_taylor_method(pet_model *model)
   // local varibles
   double psychrometric_constant_Pa_per_C;
   double slope_sat_vap_press_curve_Pa_s;
-  double moist_air_density_kg_per_m3;
   double water_latent_heat_of_vaporization_J_per_kg;
-  double moist_air_gas_constant_J_per_kg_K;
   double moist_air_specific_humidity_kg_per_m3;
-  double vapor_pressure_deficit_Pa;
   double liquid_water_density_kg_per_m3;
   double lambda_pet;
   double radiation_balance_pevapotranspiration_rate_m_per_s;
@@ -31,18 +28,13 @@ double pevapotranspiration_priestley_taylor_method(pet_model *model)
   calculate_intermediate_variables(model);
 
   liquid_water_density_kg_per_m3 = model->inter_vars.liquid_water_density_kg_per_m3;
-  water_latent_heat_of_vaporization_J_per_kg=model->inter_vars.water_latent_heat_of_vaporization_J_per_kg;
-  vapor_pressure_deficit_Pa=model->inter_vars.vapor_pressure_deficit_Pa;
-  moist_air_gas_constant_J_per_kg_K=model->inter_vars.moist_air_gas_constant_J_per_kg_K;
-  moist_air_density_kg_per_m3=model->inter_vars.moist_air_density_kg_per_m3;
   slope_sat_vap_press_curve_Pa_s=model->inter_vars.slope_sat_vap_press_curve_Pa_s;
   water_latent_heat_of_vaporization_J_per_kg=model->inter_vars.water_latent_heat_of_vaporization_J_per_kg;
   psychrometric_constant_Pa_per_C=model->inter_vars.psychrometric_constant_Pa_per_C;
 
   delta=slope_sat_vap_press_curve_Pa_s;
   gamma=psychrometric_constant_Pa_per_C;
 
-  lambda_pet=0.0;
   if( (model->pet_options.use_aerodynamic_method == FALSE ) && (model->pet_options.use_penman_monteith_method==FALSE) )
   {
     // This is equation 3.5.9 from Chow, Maidment, and Mays textbook.

include/pet_tools.h

@@ -62,14 +62,14 @@ double calculate_net_radiation_W_per_sq_m(pet_model *model)
     surface_longwave_albedo=0.03;   // water - actually not this simple, but close enough for now
   }
 
-  if(model->pet_options.yes_aorc==0)  // we must calculate longwave incoming from the atmosphere 
+  if(model->pet_options.yes_aorc==0)
+  {
+    // calculate longwave incoming from the atmosphere
     saturation_water_vapor_partial_pressure_Pa=calc_air_saturation_vapor_pressure_Pa(model->surf_rad_forcing.air_temperature_C); 
 
-  actual_water_vapor_partial_pressure_Pa=model->surf_rad_forcing.relative_humidity_percent/100.0*
+    actual_water_vapor_partial_pressure_Pa=model->surf_rad_forcing.relative_humidity_percent/100.0*
                                          saturation_water_vapor_partial_pressure_Pa;
 
-  if(model->pet_options.yes_aorc==0)
-  {
     // CALCULATE DOWNWELLING LONGWAVE RADIATION FLUX FROM ATMOSPHERE, W/m2.
     if(0.90 < model->surf_rad_forcing.cloud_cover_fraction) // very nearly overcast or overcast
     {
@@ -390,8 +390,6 @@ void calculate_intermediate_variables(pet_model* model)
   double moist_air_specific_humidity_kg_per_m3;
   double vapor_pressure_deficit_Pa;
   double liquid_water_density_kg_per_m3;
-  double delta;
-  double gamma;
 
   // IF SOIL WATER TEMPERATURE NOT PROVIDED, USE A SANE VALUE
   if(100.0 > model->pet_forcing.water_temperature_C) model->pet_forcing.water_temperature_C=22.0; // growing season
@@ -400,8 +398,6 @@ void calculate_intermediate_variables(pet_model* model)
 
   liquid_water_density_kg_per_m3 = calc_liquid_water_density_kg_per_m3(model->pet_forcing.water_temperature_C); // rho_w
 
-  water_latent_heat_of_vaporization_J_per_kg=2.501e+06-2370.0*model->pet_forcing.water_temperature_C;  // eqn 2.7.6 Chow etal.
-                                                                                              // aka 'lambda'
   // all methods other than radiation balance method involve at least some of the aerodynamic method calculations
 
   // IF HEAT/MOMENTUM ROUGHNESS LENGTHS NOT GIVEN, USE DEFAULTS SO THAT THEIR RATIO IS EQUAL TO 1.
@@ -451,15 +447,13 @@ void calculate_intermediate_variables(pet_model* model)
 
   // DELTA
   slope_sat_vap_press_curve_Pa_s=calc_slope_of_air_saturation_vapor_pressure_Pa_per_C(model->pet_forcing.air_temperature_C); 
-  delta=slope_sat_vap_press_curve_Pa_s;
 
   // gamma
   water_latent_heat_of_vaporization_J_per_kg=2.501e+06-2370.0*model->pet_forcing.water_temperature_C;  // eqn 2.7.6 Chow etal.
                                                                                               // aka 'lambda'
   psychrometric_constant_Pa_per_C=CP*model->pet_forcing.air_pressure_Pa*
                                   model->pet_params.heat_transfer_roughness_length_m/
                                   (0.622*water_latent_heat_of_vaporization_J_per_kg);
-  gamma=psychrometric_constant_Pa_per_C;
 
   model->inter_vars.liquid_water_density_kg_per_m3=liquid_water_density_kg_per_m3;
   model->inter_vars.water_latent_heat_of_vaporization_J_per_kg=water_latent_heat_of_vaporization_J_per_kg;