Rename isolated Schaake func to avoid collisions.

NOAA-OWP · Mar 2, 2021 · bfe2332 · bfe2332
1 parent c0d56b3
commit bfe2332
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/models/kernels/schaake_partitioning.hpp b/models/kernels/schaake_partitioning.hpp
@@ -4,7 +4,7 @@
 #include <math.h>
 
 
-static void Schaake_partitioning_scheme(double timestep_s, double Schaake_adjusted_magic_constant_by_soil_type,
+static void Schaake_partitioning_scheme_cpp(double timestep_s, double Schaake_adjusted_magic_constant_by_soil_type,
                                  double column_total_soil_moisture_deficit_m, double water_input_depth_m,
                                  double *surface_runoff_depth_m, double *infiltration_depth_m)
 {

diff --git a/src/models/tshirt/Tshirt.cpp b/src/models/tshirt/Tshirt.cpp
@@ -276,7 +276,7 @@ namespace tshirt {
 
         // Perform Schaake partitioning, passing some declared references to hold the calculated values.
         double surface_runoff, subsurface_infiltration_flux;
-        Schaake_partitioning_scheme(dt, model_params.Cschaake, soil_column_moisture_deficit_m, input_storage_m,
+        Schaake_partitioning_scheme_cpp(dt, model_params.Cschaake, soil_column_moisture_deficit_m, input_storage_m,
                                     &surface_runoff, &subsurface_infiltration_flux);
 
         double subsurface_excess, nash_subsurface_excess;