Cleanup

Configuration/Simulation/Scallop.cfg

@@ -15,5 +15,5 @@ Select Fishing Effort     =# FEFF Fishing Effort
 Select Fishing Mortality  =# FMOR Fishing Mortality
 Select Landings by Number =# LAND Landings by number of scallops
 Select Landings by Weight =# LNDW Landings by weight in grams
-Select LPUE               =# LPUE Landing Per Unit Effor, (per day)
+Select LPUE               =# LPUE Landing Per Unit Effort, (per day)
 Select RECR               =# Recruitment

PythonScripts/GUI/GeoSAM/GeoSams.py

@@ -522,8 +522,8 @@ def WriteScallopConfig(self):
             if(not self.frame1.landVar.get()): f.write('# Select Landings by Number =# LAND Landings by number of scallops\n')
             if(self.frame1.lndwVar.get()):     f.write('Select Landings by Weight =# LNDW Landings by weight in grams\n')
             if(not self.frame1.lndwVar.get()): f.write('# Select Landings by Weight =# LNDW Landings by weight in grams\n')
-            if(self.frame1.lpueVar.get()):     f.write('Select LPUE               =# LPUE Landing Per Unit Effor, (per day)\n')
-            if(not self.frame1.lpueVar.get()): f.write('# Select LPUE               =# LPUE Landing Per Unit Effor, (per day)\n')
+            if(self.frame1.lpueVar.get()):     f.write('Select LPUE               =# LPUE Landing Per Unit Effort, (per day)\n')
+            if(not self.frame1.lpueVar.get()): f.write('# Select LPUE               =# LPUE Landing Per Unit Effort, (per day)\n')
             if(self.frame1.recrVar.get()):     f.write('Select RECR               =# Recruitment\n')
             if(not self.frame1.recrVar.get()): f.write('# Select RECR               =# Recruitment\n')
             f.close()

PythonScripts/GUI/GeoSAM/MainInputFrame.py

@@ -374,18 +374,28 @@ def pop_up(self):
     This is used to save processing time rather than processing everything. 
     Especially true during interpolation as it would take over an hour to do 
     the interpolation. For example for MA with 11631 grid locations.
-      - Approx 2 minutes per interpolation
-      - Given 3 years worth of data, plus initial conditions
-      - 9 listed outputs
+    •	Approx 2 minutes per interpolation
+    •	Given 3 years worth of data, plus initial conditions
+    •	9 listed outputs
     Thus 9 x 4 x 2 or 72 minutes. 
     GB is proportionately shorter with only 6802 grid locations.
 
+    •	ABUN: abundance in scallops per square meter
+    •	BMMT: biomass in metric tons
+    •	EBMS: exploitable biomass in metric tons
+    •	FEFF: Fishing Effort
+    •	FMOR: Fishing Mortality
+    •	LAND: Landings by number of scallops
+    •	LNDW: Landings by weight in grams
+    •	LPUE: Landing Per Unit Effort, (per day)
+    •	RECR: Recruitment in scallops per square meter
+    
 Duration
     This defines the start and stop years over which the simulation will 
     forecast growth at time intervals specified by time steps per year.
     For example, for the default value of 13
-    - 1/13 = 0.077 years
-    - 0.077 * 365 = 28.077 days or roughly every 4 weeks
+    •	1/13 = 0.077 years
+    •	0.077 * 365 = 28.077 days or roughly every 4 weeks
 
     The year range is limited by default to 5 years, e.g. 2015 to 2019.
     See SHOW Args. The user can modify this on the command line:

PythonScripts/GUI/GeoSAM/SortByAreaFrame.py

@@ -420,7 +420,7 @@ def ExportAll(self):
                                 of.write(line)
                     of.close()
                     f.close()
-                    shutil.copy(scratchFName, self.exportFileName)
+                    shutil.move(scratchFName, self.exportFileName)
 
                 messagebox.showinfo('Export This', f'FILE SAVED: {self.exportFileName}')
 

SRC/ScallopMortality.f90

@@ -73,7 +73,7 @@ module Mortality_Mod
     logical plot_FMOR ! Fishing Mortality
     logical plot_LAND ! Landings by number of scallops
     logical plot_LNDW ! Landings by weight in grams
-    logical plot_LPUE ! Landing Per Unit Effor, (per day)
+    logical plot_LPUE ! Landing Per Unit Effort, (per day)
     logical plot_RECR ! Recruitment
 endtype DataForPlots