Skip to content

Commit

Permalink
Fix MacOS related errors
Browse files Browse the repository at this point in the history
  • Loading branch information
TCallaghan2 committed Jul 15, 2024
1 parent 68b3115 commit 494434a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion PreProcess/HabCamData5mmbin.m
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ function HabCamData5mmbin(yrStart, yrEnd, domain)
if isOctave
stratum_t = M(j,16);
% place holder for is_closed
is_closed_t = array2table(zeros(size(stratum_t)), 'VariableNames',{'Is Closed'});
is_closed_t = zeros(size(stratum_t));
lat_t = M(j,5);
lon_t = M(j,6);
mon = M(j,2);
Expand Down
1 change: 1 addition & 0 deletions PreProcess/PullOutRecruitData.m
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ function PullOutRecruitData(src, useHabCam)
arg_list=argv();
if ~strcmp(arg_list(1), '--gui');
src = str2num(cell2mat(arg_list(1)));
useHabCam = cell2mat(arg_list(1));
else
src = str2num(src);
end
Expand Down
10 changes: 5 additions & 5 deletions Unpack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ make
cd ..

# Pull Out Survey Data --------------------------------------------------------------
if [ "$5" == "M" && "$6" == "D"]; then
if [[ "$5" == "M" && "$6" == "D" ]]; then
echo matlab.exe -batch "TrawlData5mmbin(%1, %2, %3, '%4'); exit;"
matlab.exe -batch "TrawlData5mmbin(%1, %2, %3, '%4'); exit;"
fi
Expand All @@ -165,7 +165,7 @@ if [ $? != 0 ]; then
exit 1
fi

if [ "$5" == "M" && "$6" == "H"]; then
if [[ "$5" == "M" && "$6" == "H" ]]; then
echo matlab.exe -batch "HabCamData5mmbin(%1, %2, '%4'); exit;"
matlab.exe -batch "HabCamData5mmbin(%1, %2, '%4'); exit;"
fi
Expand All @@ -174,7 +174,7 @@ if [ $? != 0 ]; then
exit 1
fi

if [ "$5" == "O" && "$6" == "D"]; then
if [[ "$5" == "O" && "$6" == "D" ]]; then
echo octave PreProcess/TrawlData5mmbin.m $1 $2 $3 $4
octave PreProcess/TrawlData5mmbin.m $1 $2 $3 $4
fi
Expand All @@ -183,7 +183,7 @@ if [ $? != 0 ]; then
exit 1
fi

if [ "$5" == "O" && "$6" == "H"]; then
if [[ "$5" == "O" && "$6" == "H" ]]; then
echo octave PreProcess/HabCamData5mmbin.m $1 $2 $4
octave PreProcess/HabCamData5mmbin.m $1 $2 $4
fi
Expand All @@ -193,7 +193,7 @@ if [ $? != 0 ]; then
fi

# Pull Out Recruit Data --------------------------------------------------------------
if [ "$6" == 'H"']; then
if [ "$6" == "H" ]; then
hcChar='T'
else
hcChar='F'
Expand Down

0 comments on commit 494434a

Please sign in to comment.