Fixed issue 61, thank you Jie for finding the bug

seacode · Jan 15, 2015 · aab6f2a · aab6f2a
1 parent ca33d6d
commit aab6f2a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 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
-   6.0       1.0      30.0          3       0    0.0     3.0         # gscale males or combined
-  115.      65.0     165.0          2       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
+  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
 # ———————————————————————————————————————————————————————————————————————————————————— ##
 
 ## ———————————————————————————————————————————————————————————————————————————————————— ##

diff --git a/src/gmacs.tpl b/src/gmacs.tpl
@@ -1140,7 +1140,8 @@ FUNCTION calc_growth_transition
 		sbi = size_breaks / gscale(h);
 		for( l = 1; l <= nclass; l++ )
 		{
-			dMeanSizeAfterMolt = (sbi(l) + molt_increment(h)(l)) / gscale(h);
+			dMeanSizeAfterMolt = (size_breaks(l) + molt_increment(h)(l)) / gscale(h);
+			
 			psi.initialize();
 			for( ll = l; ll <= nclass+1; ll++ )
 			{
@@ -1275,7 +1276,7 @@ FUNCTION calc_molting_probability
 	int l,h;
 	molt_probability.initialize();
 	P.initialize();
-	double tiny = 0.001;
+	double tiny = 0.000;
 	for( h = 1; h <= nsex; h++ )
 	{
 		dvariable mu = molt_mu(h);
@@ -2387,6 +2388,7 @@ REPORT_SECTION
 	}
 	REPORT(survey_q);
 	REPORT(P);
+	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));