Skip to content

repair density-dependent parameter functionality #780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rick-Methot-NOAA merged 2 commits into from
Jul 28, 2026
Merged

repair density-dependent parameter functionality #780

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d84178
repair density-dependent parameter functionality
Rick-Methot-NOAA Jul 27, 2026
45ab11f
addressing review comments
Rick-Methot-NOAA Jul 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions SS_global.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ GLOBALS_SECTION
adstring onenum2(4);
adstring anystring;
adstring anystring2;
adstring DD_name;
adstring report_sso_filename;
adstring MSY_name; // label describing what Do_MSY and MSY_units are being used

Expand Down Expand Up @@ -716,13 +717,17 @@ GLOBALS_SECTION
// if(timevary_setup(7)==97) timevary_setup(7)=-3; // for linking to rel_smrybio
// if(timevary_setup(7)==96) timevary_setup(7)=-4; // for linking to rel_smry_num
echoinput << "env link_type: " << k << " env_var: " << timevary_setup(7) << endl;
if (timevary_setup(7) >= 0)
{DD_name = "X";}
else
{DD_name = "_DD";}
switch (k)
{
case 1: // multiplicative
{
echoinput << " do env mult for parm: " << j << " " << ParmLabel(j) << endl;
ParCount++;
ParmLabel += ParmLabel(j) + "_ENV_mult";
ParmLabel += ParmLabel(j) + "_ENV_mult" + DD_name;
timevary_parm_cnt++;
dvector tempvec(1, 7);
tempvec.initialize();
Expand All @@ -741,7 +746,7 @@ GLOBALS_SECTION
{
echoinput << " do env additive " << endl;
ParCount++;
ParmLabel += ParmLabel(j) + "_ENV_add";
ParmLabel += ParmLabel(j) + "_ENV_add" + DD_name;
timevary_parm_cnt++;
dvector tempvec(1, 7);
tempvec.initialize();
Expand All @@ -760,7 +765,7 @@ GLOBALS_SECTION
{
echoinput << " do env constrained " << endl;
ParCount++;
ParmLabel += ParmLabel(j) + "_ENV_add_constr";
ParmLabel += ParmLabel(j) + "_ENV_add_constr" + DD_name;
timevary_parm_cnt++;
dvector tempvec(1, 7);
tempvec.initialize();
Expand All @@ -778,7 +783,7 @@ GLOBALS_SECTION
case 4: // logistic with offset
{
ParCount++;
ParmLabel += ParmLabel(j) + "_ENV_offset";
ParmLabel += ParmLabel(j) + "_ENV_offset" + DD_name;
timevary_parm_cnt++;
dvector tempvec(1, 7);
tempvec.initialize();
Expand All @@ -792,7 +797,7 @@ GLOBALS_SECTION
}
timevary_parm_rd.push_back(tempvec(1, 7));
ParCount++;
ParmLabel += ParmLabel(j) + "_ENV_lgst_slope";
ParmLabel += ParmLabel(j) + "_ENV_lgst_slope" + DD_name;
timevary_parm_cnt++;
tempvec.initialize();
if (autogen_timevary >= 1) // read
Expand Down
8 changes: 4 additions & 4 deletions SS_readcontrol_330.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1812,7 +1812,7 @@
env_data_pass(1) = env_data_minyr(k);
env_data_pass(2) = env_data_maxyr(k);
}
else if (abs(MGparm_1(j, 8) > 0)) // density-dependence
else if (abs(MGparm_1(j, 8)) > 0) // density-dependence
{
timevary_setup(7) = -int(abs(MGparm_1(j, 8)) - k * 100);
do_densitydependent = 1;
Expand Down Expand Up @@ -2191,7 +2191,7 @@
env_data_pass(1) = env_data_minyr(k);
env_data_pass(2) = env_data_maxyr(k);
}
else if (abs(SRparm_1(j, 8) > 0)) // density-dependence
else if (abs(SRparm_1(j, 8)) > 0) // density-dependence
{
timevary_setup(7) = -int(abs(SRparm_1(j, 8)) - k * 100);
do_densitydependent = 1;
Expand Down Expand Up @@ -3340,7 +3340,7 @@
env_data_pass(1) = env_data_minyr(k);
env_data_pass(2) = env_data_maxyr(k);
}
else if (abs(Q_parm_1(j, 8) > 0)) // density-dependence
else if (abs(Q_parm_1(j, 8)) > 0) // density-dependence
{
timevary_setup(7) = -int(abs(Q_parm_1(j, 8)) - k * 100);
do_densitydependent = 1;
Expand Down Expand Up @@ -4603,7 +4603,7 @@
env_data_pass(1) = env_data_minyr(k);
env_data_pass(2) = env_data_maxyr(k);
}
else if (abs(selparm_1(j, 8) > 0)) // density-dependence
else if (abs(selparm_1(j, 8)) > 0) // density-dependence
{
timevary_setup(7) = -int(abs(selparm_1(j, 8)) - k * 100);
do_densitydependent = 1;
Expand Down
Loading