Merge branch 'hotfix/1.0.2'

Test if yieldByfishery is defined before using it
osmose-model · Jan 8, 2020 · 86301a8 · 86301a8
2 parents 5b15d47 + ded5d55
commit 86301a8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: osmose
 Type: Package
 Title: Object Oriented Simulator of Marine Ecosystems
-Version: 1.0.1
+Version: 1.0.2
 Date: 2019-09-19
 Authors@R: c(
   person("Yunne-Jai", "Shin", role="aut"),

diff --git a/R/osmose2R.R b/R/osmose2R.R
@@ -60,14 +60,16 @@ osmose2R.v4r0 = function (path=NULL, species.names=NULL) {
 
   )
 
-  # temporal
-  outputData$yield = aperm(apply(outputData$yieldByFishery, 2:4, sum, na.rm=TRUE), 
-                           perm = c(2,1,3))
-  rownames(outputData$yield) = seq_len(nrow(outputData$yield)) - 1
-  colnames(outputData$yield) = colnames(outputData$biomass)
-
-  class(outputData$yield) = "osmose.yield"
-  # end of temporal
+  if(!is.null(outputData$yieldByFishery)) {
+    # temporal
+    outputData$yield = aperm(apply(outputData$yieldByFishery, 2:4, sum, na.rm=TRUE), 
+                             perm = c(2,1,3))
+    rownames(outputData$yield) = seq_len(nrow(outputData$yield)) - 1
+    colnames(outputData$yield) = colnames(outputData$biomass)
+
+    class(outputData$yield) = "osmose.yield"
+    # end of temporal
+  }
 
   model = list(version = "4",
                model = .getModelName(path = path),