From e1fb3ed9cd02c970f10209937872472025ff003c Mon Sep 17 00:00:00 2001 From: TCallaghan2 <149170121+TCallaghan2@users.noreply.github.com> Date: Mon, 8 Jul 2024 10:20:52 -0700 Subject: [PATCH 1/2] Wrong logic in Set_Discard --- SRC/ScallopMortality.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SRC/ScallopMortality.f90 b/SRC/ScallopMortality.f90 index 6e1bc7d..45a2846 100644 --- a/SRC/ScallopMortality.f90 +++ b/SRC/ScallopMortality.f90 @@ -1071,7 +1071,7 @@ subroutine Mortality_Write_At_Timestep(year, ts, state_mat, weight_grams, mortal elemental real(dp) function Set_Discard(length, selectivity, cull_size, discard, is_closed) real(dp), intent(in) :: length, cull_size, discard, selectivity logical, intent(in) :: is_closed - if ((length .gt. cull_size) .and. is_closed) then + if ((length .gt. cull_size) .or. is_closed) then Set_Discard = 0.D0 else Set_Discard = discard * selectivity From abbe5c34ef43dd6a016a3b9eec4d7e013a0b072d Mon Sep 17 00:00:00 2001 From: TCallaghan2 <149170121+TCallaghan2@users.noreply.github.com> Date: Mon, 8 Jul 2024 10:48:37 -0700 Subject: [PATCH 2/2] Correct Selectivity Frame --- PythonScripts/GUI/GeoSAM/GrowthFrame.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PythonScripts/GUI/GeoSAM/GrowthFrame.py b/PythonScripts/GUI/GeoSAM/GrowthFrame.py index 2daa8af..a4ed01b 100644 --- a/PythonScripts/GUI/GeoSAM/GrowthFrame.py +++ b/PythonScripts/GUI/GeoSAM/GrowthFrame.py @@ -155,7 +155,7 @@ def __init__(self, container, fName): fishingFrame.grid(row=1, column=0, padx=10, sticky='n') # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - selectivityFrame = ttk.LabelFrame(self, text='Selectivity', style='Growth.TFrame') + selectivityFrame = ttk.LabelFrame(self, text='Selectivity', style='SAMS.TFrame') #------------------------------------------------------------------------------------------- self.maFSelectA = SubFrameElement(self, selectivityFrame, 'MA FSelectA', self.maFSelAStr, 0, 0, 1, valCmd=floatCallback, width=10) #-------------------------------------------------------------------------------------------