mErged jim's changes

seacode · Jan 15, 2015 · 83378c9 · 83378c9
2 parents aab6f2a + 120df99
commit 83378c9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/examples/bbrkc/bbrkc_ss.ctl b/examples/bbrkc/bbrkc_ss.ctl
@@ -32,9 +32,9 @@
 # —————————————————————————————————————————————————————————————————————————————————————— #
   17.5      10.0      30.0          3       0    0.0    20.0         # alpha males or combined
   0.10       0.0       0.5          3       0    0.0    10.0         # beta males or combined
-  0.75       0.01     30.0         -3       0    0.0     3.0         # gscale males or combined
-  120.      65.0     165.0          2       0    0.0     3.0         # molt_mu males or combined
-   0.2       0.0       1.0          2       0    0.0     3.0         # molt_cv males or combined
+   0.8       0.01     30.0         -3       0    0.0     3.0         # gscale males or combined
+  140.      65.0     165.0          4       0    0.0     3.0         # molt_mu males or combined
+   0.2       0.0       1.0          3       0    0.0     3.0         # molt_cv males or combined
 # ———————————————————————————————————————————————————————————————————————————————————— ##
 
 ## ———————————————————————————————————————————————————————————————————————————————————— ##
@@ -54,11 +54,11 @@
 ## Index  type  mu   sd  dep  nodes  nodes mirror lam1  lam2  lam3 | block  block       ##
 ## ———————————————————————————————————————————————————————————————————————————————————— ##
 ## Selectivity P(capture of all sizes)
-   1      3    95   140  0    1      1     2      12.5  12.5  12.5   1975   2014
+   1      3    95   140  0    1      1     3      12.5  12.5  12.5   1975   2014
    2      3    110  150  0    1      1    -2      12.5  12.5  12.5   1975   2014 
-   3      2     90   10  0    1      1     2      12.5  12.5  12.5   1975   1981
-   3      2     90   10  0    1      1     2      12.5  12.5  12.5   1982   2014
-   4      2     70   10  0    1      1    -2      12.5  12.5  12.5   1975   2014
+   3      2     90   10  0    1      1     4      12.5  12.5  12.5   1975   1981
+   3      2     90   10  0    1      1     4      12.5  12.5  12.5   1982   2014
+   4      2     70   10  0    1      1    -3      12.5  12.5  12.5   1975   2014
 ## ———————————————————————————————————————————————————————————————————————————————————— ##
 ## Retained
     -1      2    135    2  0    1      1    -2      12.5  12.5  12.5   1975   2014
@@ -83,7 +83,7 @@
 ## Trap  Trawl NMFS  BSFRF
 ## Mean_F  STD_PHZ1  STD_PHZ2  PHZ
      0.20      0.10      1.10    1
-     0.10      0.10      1.10    1
+     0.10      0.10      1.10    2
     0.00      2.00      2.00   -1
      0.00      2.00      2.00   -1
 ## ———————————————————————————————————————————————————————————————————————————————————— ##

diff --git a/src/gmacs.tpl b/src/gmacs.tpl
@@ -1141,7 +1141,6 @@ FUNCTION calc_growth_transition
 		for( l = 1; l <= nclass; l++ )
 		{
 			dMeanSizeAfterMolt = (size_breaks(l) + molt_increment(h)(l)) / gscale(h);
-			
 			psi.initialize();
 			for( ll = l; ll <= nclass+1; ll++ )
 			{
@@ -2391,9 +2390,11 @@ REPORT_SECTION
 	REPORT(growth_transition);
 	dmatrix size_transition_M(1,nclass,1,nclass);
 	dmatrix size_transition_F(1,nclass,1,nclass);
+
 	size_transition_M = value(P(1) * growth_transition(1));
 	for (int i=1;i<=nclass;i++)
 	  size_transition_M(i,i) += value(1.-P(1,i,i));
+
 	REPORT(size_transition_M);
 	
 	if (nsex==2)