ffwd works now with 2-sex FLStocks

flr · Apr 5, 2024 · 1077adb · 1077adb
1 parent 20088e8
commit 1077adb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: FLCore
 Title: Core Package of FLR, Fisheries Modelling in R
-Version: 2.6.20.9008
+Version: 2.6.20.9010
 Authors@R: c(
   person("Iago", "Mosqueira", email = "iago.mosqueira@wur.nl",
     role = "cre", comment=c(c(ORCID = "0000-0002-3252-0591"))),

diff --git a/R/FLStock.R b/R/FLStock.R
@@ -2245,12 +2245,11 @@ ffwd <- function(object, sr, fbar=control, control=fbar, deviances="missing") {
       # rec * deviances
        naa[1, i] <- rep(eval(sr@model[[3]],
         c(as(sr@params, 'list'), list(
-        ssb=c(colSums(naa[, i - recage] * srp[, i - recage], na.rm=TRUE))))) /
-        dm[3], dm[3]) * c(deviances[, i])
+        ssb=c(colSums(naa[, i - recage, 1] * srp[, i - recage, 1],
+          na.rm=TRUE))))) / dm[3], each=dm[3]) * c(deviances[, i])
     }
 
   # UPDATE stock.n & harvest
-
   stock.n(object)[, yrs] <- naa[, -1]
   harvest(object)[, yrs] <- faa[, -1]