turn off extra switches when Do_More_Std == 1

SS_readcontrol_330.tpl

@@ -1608,6 +1608,7 @@
   //  labels for the types are found in:  MGtype_Lbl
  LOCAL_CALCS
       // clang-format on
+      echoinput<<"start assigning MGparm_type"<<endl;
       gp = 0;
   for (gg = 1; gg <= gender; gg++)
     for (GPat = 1; GPat <= N_GP; GPat++)
@@ -1619,17 +1620,20 @@
       mgp_type(Ip, Ip + N_growparms - 1) = 2; // growth parms
 
       // check on out of bound Lmin values.  Only check females because males can be offset from females
-      if ( gp == 1 && WTage_rd == 0 && MGparm_1(Ip,1) < len_bins(1))
-      {
-        warnstream << "parm min for Lmin: " << MGparm_1(Ip,1) << " cannot be less than population min length bin " << len_bins(1);
-        write_message (FATAL, 0); // EXIT!
-      }
-      if ( gp == 1 && WTage_rd == 0 &&  MGparm_1(Ip,3) < len_bins(1))
+
+     if ( gp == 1 && WTage_rd == 0)
       {
-        warnstream << "parm init value for Lmin: " << MGparm_1(Ip,3) << " cannot be less than population min length bin " << len_bins(1);
-        write_message (FATAL, 0); // EXIT!
+        if (MGparm_1(Ip,1) < len_bins(1))
+        {
+          warnstream << "parm min for Lmin: " << MGparm_1(Ip,1) << " cannot be less than population min length bin " << len_bins(1);
+          write_message (FATAL, 0); // EXIT!
+        }
+        if (MGparm_1(Ip,3) < len_bins(1))
+        {
+          warnstream << "parm init value for Lmin: " << MGparm_1(Ip,3) << " cannot be less than population min length bin " << len_bins(1);
+          write_message (FATAL, 0); // EXIT!
+        }
       }
-
       //  check on estimation of variance parameters for CV_young and CV_old
       for (int kk = Ip + N_growparms - 2; kk <= Ip + N_growparms - 1; kk++)
       {
@@ -5585,24 +5589,21 @@
   // clang-format on
   Extra_Std_N = 0;
 
-  // don't read any extra std inputs
-  if (Do_More_Std == 0)
-  {
-    Do_Selex_Std = 0;
-    Selex_Std_AL = 1;
-    Selex_Std_Year = endyr;
-    Selex_Std_Cnt = 0;
-    Do_Growth_Std = 0;
-    Growth_Std_Cnt = 0;
-    Do_NatAge_Std = 0;
-    NatAge_Std_Cnt = 0;
-    NatAge_Std_Year = endyr;
-    Do_NatM_Std = 0;
-    NatM_Std_Cnt = 0;
-    Do_Dyn_Bzero = 0;
-    Do_se_smrybio = 0;
-    Do_se_LnSSB = 0;
-  }
+  // Itialize all switches for extra std inputs
+  Do_Selex_Std = 0;
+  Selex_Std_AL = 1;
+  Selex_Std_Year = endyr;
+  Selex_Std_Cnt = 0;
+  Do_Growth_Std = 0;
+  Growth_Std_Cnt = 0;
+  Do_NatAge_Std = 0;
+  NatAge_Std_Cnt = 0;
+  NatAge_Std_Year = endyr;
+  Do_NatM_Std = 0;
+  NatM_Std_Cnt = 0;
+  Do_Dyn_Bzero = 0;
+  Do_se_smrybio = 0;
+  Do_se_LnSSB = 0;
 
   // read standard extra std inputs (only option prior to 3.30.15)
   if (Do_More_Std > 0)
@@ -5623,19 +5624,17 @@
     if (Do_NatAge_Std == 0) NatAge_Std_Cnt = 0;
     Do_NatM_Std = 0; // value replaced below if Do_More_Std==2
     NatM_Std_Cnt = 0; // value replaced below if Do_More_Std==2
-  }
-
-  // read additional extra std inputs for NatM (added in 3.30.15)
-  if (Do_More_Std == 2)
-  {
-    Do_NatM_Std = More_Std_Input(10);
-    NatM_Std_Cnt = More_Std_Input(11);
-    if (Do_NatM_Std <= 0) {
-      NatM_Std_Cnt = 0;
+    // read additional extra std inputs for NatM (added in 3.30.15)
+    if (Do_More_Std == 2)
+    {
+      Do_NatM_Std = More_Std_Input(10);
+      NatM_Std_Cnt = More_Std_Input(11);
+      if (Do_NatM_Std <= 0) NatM_Std_Cnt = 0;
+      Do_Dyn_Bzero = More_Std_Input(12);
+      Do_se_smrybio = More_Std_Input(13);
     }
-    Do_Dyn_Bzero = More_Std_Input(12);
-    Do_se_smrybio = More_Std_Input(13);
   }
+
   // clang-format off
  END_CALCS
 

SS_write_report.tpl

@@ -1741,7 +1741,6 @@ FUNCTION void write_bigoutput()
     double cross = 0.0;
     double Durbin = 0.0;
     double var = 0.0;
-     warning << recdev_first << " "<<recdev_start << " " << styr << endl;
     for (y = recdev_first; y <= recdev_end; y++)
     {
       temp1 = recdev(y);