Added SOL for WGBFAS

Sea2Data · Apr 28, 2020 · 4d17f9a · 4d17f9a
1 parent 0b69d4a
commit 4d17f9a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/intercatch/wgcse_2020/README.md b/intercatch/wgcse_2020/README.md
@@ -1,6 +1,6 @@
 # Intercatch submission for WGCSE
 
-Contains scripts used for produsing SI lines for intercatch submission for WGCSE in 2020. 
+Contains scripts used for produsing SI lines for intercatch submission for WGCSE and WGBFAS in 2020. 
 Fleet decompositions (metiers) are merged in from logooks when available. For both logbooks and landing necessary fleet configurations are made in csv files in data/
 
 other configuration of area codes, stocks and metiers are in data/*.csv

diff --git a/intercatch/wgcse_2020/data/fleet_wo_logbook.csv b/intercatch/wgcse_2020/data/fleet_wo_logbook.csv
@@ -31,6 +31,7 @@ MIS_MIS_0_0_0_HC	41	27.3.a	Div
 MIS_MIS_0_0_0_HC	42	27.3.a	Div
 MIS_MIS_0_0_0_HC	11	27.3.a	Div
 MIS_MIS_0_0_0_HC	33	27.3.a	Div
+MIS_MIS_0_0_0_HC	34	27.3.a	Div
 MIS_MIS_0_0_0_HC	80	27.3.a	Div
 #
 LLS_FIF_0_0_0_all	35	27.6.a	Div
diff --git a/intercatch/wgcse_2020/data/stocks.csv b/intercatch/wgcse_2020/data/stocks.csv
@@ -10,3 +10,4 @@ anf.27.3a46	ANF	Div	27.4.a	T	F
 anf.27.3a46	ANF	Div	27.4.b	T	F
 lez.27.4a6a	LEZ	Div	27.4.a	T	F
 lez.27.4a6a	LEZ	Div	27.6.a	T	F
+sol.27.20-24	SOL	Div	27.3.a	T	F
diff --git a/intercatch/wgcse_2020/landings_overview.R b/intercatch/wgcse_2020/landings_overview.R
@@ -50,5 +50,5 @@ sum(landings$`Art FAO (kode)` == "ANF")
 # reduserer logbøker og landinger til arter det skal rapporteres for
 #
 warning("Removing COD and HAD. Arved takes care of that")
-landings <- landings[landings$`Art FAO (kode)` %in% c("ANF", "LEZ"),]
-log <- log[log$FANGSTART_FAO %in% c("ANF", "LEZ"),]
+landings <- landings[landings$`Art FAO (kode)` %in% c("ANF", "LEZ", "SOL"),]
+log <- log[log$FANGSTART_FAO %in% c("ANF", "LEZ", "SOL"),]