From d99136cf5599f0743762ed7d8f416f454398e43c Mon Sep 17 00:00:00 2001 From: "kathryn.doering" Date: Thu, 16 Sep 2021 13:01:52 -0400 Subject: [PATCH 1/3] Fix: increment warning where forgotten --- SS_benchfore.tpl | 8 ++++---- SS_expval.tpl | 2 +- SS_objfunc.tpl | 2 +- SS_popdyn.tpl | 8 ++++---- SS_selex.tpl | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/SS_benchfore.tpl b/SS_benchfore.tpl index a55ee2b7..22d7af1d 100644 --- a/SS_benchfore.tpl +++ b/SS_benchfore.tpl @@ -128,7 +128,7 @@ FUNCTION void setup_Benchmark() for (s=1;s<=nseas;s++) { if(Fcast_RelF_Use(s,f)==0. && bycatch_setup(f,3)>0) - {Fcast_RelF_Use(s,f)=1.0e-6; warning<0) @@ -137,7 +137,7 @@ FUNCTION void setup_Benchmark() for (s=1;s<=nseas;s++) { if(Fcast_RelF_special(s,f)==1 && Fcast_RelF_Use(s,f)==0.0) - {Fcast_RelF_Use(s,f)=1.0e-6; warning<=2) {recdev(recdev_start,recdev_end)=recdev2(recdev_start,recdev_end);} if(Do_Forecast>0 && do_recdev>0) recdev(recdev_end+1,YrMax)=Fcast_recruitments(recdev_end+1,YrMax); // only needed here for reporting -// if(mcmc_counter>0) warning<0) N_warn++; warning<0) @@ -1403,7 +1403,7 @@ FUNCTION void get_time_series() countN += 1; // increment count of values included in average annual_F(y,2) += log(tempM)-log(tempZ); // F=Z-M annual_F(y,3) += log(tempbase)-log(tempM); // M -// if(save_for_report==1) warning< Date: Thu, 16 Sep 2021 13:57:16 -0400 Subject: [PATCH 2/3] fix: wrap if statement --- SS_expval.tpl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/SS_expval.tpl b/SS_expval.tpl index 58d7d2cc..a78b117d 100644 --- a/SS_expval.tpl +++ b/SS_expval.tpl @@ -468,8 +468,11 @@ FUNCTION void Get_expected_values(const int y,const int t); exp_disc(f,j)=catch_fleet(t,f,4)-catch_fleet(t,f,6); // discard in numbers if(disc_units(f)==2) exp_disc(f,j) /= (catch_fleet(t,f,4) + 0.0000001); } - if(exp_disc(f,j)<0.0) N_warn++; warning< Date: Thu, 16 Sep 2021 14:05:44 -0400 Subject: [PATCH 3/3] warnings: rm commented out warnings --- SS_benchfore.tpl | 2 -- SS_global.tpl | 2 -- SS_popdyn.tpl | 5 ----- SS_readcontrol_330.tpl | 1 - SS_readdata_330.tpl | 1 - SS_selex.tpl | 1 - 6 files changed, 12 deletions(-) diff --git a/SS_benchfore.tpl b/SS_benchfore.tpl index 22d7af1d..982910ba 100644 --- a/SS_benchfore.tpl +++ b/SS_benchfore.tpl @@ -2087,7 +2087,6 @@ FUNCTION void Get_Forecast() } join1=1./(1.+mfexp(30.*(temp-0.95*max_harvest_rate))); Hrate(f,t)=join1*temp + (1.-join1)*max_harvest_rate; // new F value for this fleet, constrained by max_harvest_rate -// if(f==1) N_warn++; warning<0) // blocks with z as the block pattern { Nblocks=0.5*(block_design_pass.size()); -// if(z>N_Block_Designs) {N_warn++; warning< N Blocks "<=2) {recdev(recdev_start,recdev_end)=recdev2(recdev_start,recdev_end);} if(Do_Forecast>0 && do_recdev>0) recdev(recdev_end+1,YrMax)=Fcast_recruitments(recdev_end+1,YrMax); // only needed here for reporting -// if(mcmc_counter>0) N_warn++; warning<0) @@ -1403,7 +1399,6 @@ FUNCTION void get_time_series() countN += 1; // increment count of values included in average annual_F(y,2) += log(tempM)-log(tempZ); // F=Z-M annual_F(y,3) += log(tempbase)-log(tempM); // M -// if(save_for_report==1) N_warn++; warning<