fix merge cnflicts

NOAA-FIMS · Nov 15, 2023 · 972c221 · 972c221
1 parent f4e390f
commit 972c221
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/inst/include/population_dynamics/recruitment/functors/recruitment_base.hpp b/inst/include/population_dynamics/recruitment/functors/recruitment_base.hpp
@@ -33,7 +33,7 @@ struct RecruitmentBase : public fims_model_object::FIMSObject<Type> {
   static uint32_t id_g; /**< reference id for recruitment object*/
 
   fims::Vector<Type>
-      recruit_deviations;            /*!< A vector of recruitment deviations */
+      log_recruit_devs;            /*!< A vector of recruitment deviations */
   bool constrain_deviations = false; /*!< A flag to indicate if recruitment
                                  deviations are summing to zero or not */
 

diff --git a/tests/gtest/test_population_dynamics_recruitment_base.cpp b/tests/gtest/test_population_dynamics_recruitment_base.cpp
@@ -7,10 +7,10 @@ namespace
   TEST(RecruitmentDeviations, ConstraintWorks)
   {
     fims_popdy::SRBevertonHolt<double> recruit;
-    recruit.recruit_deviations.resize(3);
-    recruit.recruit_deviations[0] = -1.0;
-    recruit.recruit_deviations[1] = 2.0;
-    recruit.recruit_deviations[2] = 3.0;
+    recruit.log_recruit_devs.resize(3);
+    recruit.log_recruit_devs[0] = -1.0;
+    recruit.log_recruit_devs[1] = 2.0;
+    recruit.log_recruit_devs[2] = 3.0;
 
     // Test if constrain_deviations = false works
     recruit.constrain_deviations = false;