diff --git a/CaseStudies/ssp/test/SSA_Ex6Tester.m b/CaseStudies/ssp/test/SSA_Ex6Tester.m index 56ce8af7..4089d490 100644 --- a/CaseStudies/ssp/test/SSA_Ex6Tester.m +++ b/CaseStudies/ssp/test/SSA_Ex6Tester.m @@ -1,7 +1,5 @@ clear all; close all; -cd ../src/ - %% % % \section{Example 6 - Further Study} \label{sec:Ex6Tests} @@ -14,7 +12,9 @@ F6_li = 1.017; data = ... % read in slope geometry, stratigraphy, and piezometric surface - dlmread('../data files/Ex6.dat'); + dlmread('./dataFiles/Ex6.dat'); + +cd ../src/ i = 1; nlayer = data(i,1); % number of stratigraphic layers @@ -243,6 +243,8 @@ fprintf('\n') fprintf('The average rise angle of the slopes with factors of safety\n greater than 1 is %.3f rads, while the average rise angle \n of slopes with factors of safety less than 1 is %.3f rads.', mean(rise_high), mean(rise_low)); +cd ../test + %% % % Using a special test case, where the minimum allowable angle was raised diff --git a/CaseStudies/ssp/test/SSA_GenAlgTester.m b/CaseStudies/ssp/test/SSA_GenAlgTester.m index 5f115660..43526449 100644 --- a/CaseStudies/ssp/test/SSA_GenAlgTester.m +++ b/CaseStudies/ssp/test/SSA_GenAlgTester.m @@ -1,8 +1,6 @@ function SSA_GenAlgTester clear all; close all; -cd ../src/ - %% % % \section{Genetic Algorithm Tester} \label{sec:GenAlgTests} @@ -29,24 +27,24 @@ F1_cheng = 1.325; F1_li = 1.327; -data = dlmread('../data files/Ex1_Greco1996.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex1_Greco1996.surf')'; % read in slip surfaces slip1_greco = data(1:2,:); slip1_grecoVert = MatchSlice (slip1_greco, VertInspect); -data = dlmread('../data files/Ex1_MalkawiEtAl2001.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex1_MalkawiEtAl2001.surf')'; % read in slip surfaces slip1_malk = data(1:2,:); slip1_malkVert = MatchSlice (slip1_malk, VertInspect); -data = dlmread('../data files/Ex1_ChengEtAl2007.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex1_ChengEtAl2007.surf')'; % read in slip surfaces slip1_cheng = data(1:2,:); slip1_chengVert = MatchSlice (slip1_cheng, VertInspect); -data = dlmread('../data files/Ex1_LiEtAl2010.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex1_LiEtAl2010.surf')'; % read in slip surfaces slip1_li = data(1:2,:); slip1_liVert = MatchSlice (slip1_li, VertInspect); -[params_layers, params_piez, ltor] = RecieveInput('../data files/Ex1.dat'); +[params_layers, params_piez, ltor] = RecieveInput('./dataFiles/Ex1.dat'); strat = params_layers.strat; params_load = struct('Kc',0, 'Q',[], 'omega',[]); @@ -75,6 +73,8 @@ % % +cd ../src/ + for i=1:niterations [cslip1, F1, ~, ~, Fgens1, ~, rt1] = ... @@ -363,20 +363,22 @@ F2_cheng = 1.101; F2_li = 1.113; -data = dlmread('../data files/Ex2_ZolfaghariEtAl2005.surf')'; % read in slip surfaces +cd ../test/ + +data = dlmread('./dataFiles/Ex2_ZolfaghariEtAl2005.surf')'; % read in slip surfaces slip2_zolf = data(1:2,:); slip2_zolfVert = MatchSlice (slip2_zolf, VertInspect); -data = dlmread('../data files/Ex2_ChengEtAl2007.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex2_ChengEtAl2007.surf')'; % read in slip surfaces slip2_cheng = data(1:2,:); slip2_chengVert = MatchSlice (slip2_cheng, VertInspect); -data = dlmread('../data files/Ex2_LiEtAl2010.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex2_LiEtAl2010.surf')'; % read in slip surfaces slip2_li = data(1:2,:); slip2_liVert = MatchSlice (slip2_li, VertInspect); -[params_layers, params_piez, ltor] = RecieveInput('../data files/Ex2.dat'); +[params_layers, params_piez, ltor] = RecieveInput('./dataFiles/Ex2.dat'); strat = params_layers.strat; params_load = struct('Kc',0, 'Q',[], 'omega',[]); @@ -446,26 +448,27 @@ F3_cheng = 1.349; F3_li = 1.335; -data = dlmread('../data files/Ex3_ZolfaghariEtAl2005.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex3_ZolfaghariEtAl2005.surf')'; % read in slip surfaces slip3_zolf = data(1:2,:); slip3_zolfVert = MatchSlice (slip3_zolf, VertInspect); -data = dlmread('../data files/Ex3_ChengEtAl2007.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex3_ChengEtAl2007.surf')'; % read in slip surfaces slip3_cheng = data(1:2,:); slip3_chengVert = MatchSlice (slip3_cheng, VertInspect); -data = dlmread('../data files/Ex3_LiEtAl2010.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex3_LiEtAl2010.surf')'; % read in slip surfaces slip3_li = data(1:2,:); slip3_liVert = MatchSlice (slip3_li, VertInspect); -[params_layers, params_piez, ltor] = RecieveInput('../data files/Ex3.dat'); +[params_layers, params_piez, ltor] = RecieveInput('./dataFiles/Ex3.dat'); strat = params_layers.strat; params_load = struct('Kc',0, 'Q',[], 'omega',[]); params_search = struct ('Xetr',[10,15],'Xext',[23,30],'Ylim',[40,52]); params_soln = struct ('cncvu',1,'obtu',1,'evnslc',1,'ftype',0,'ltor',ltor); +cd ../src/ [ cslip3, F3, ~, ~, ~, ~, rt3] = ... % pass on to GenAlg GenAlg ( @MorgPriceSolver, params_layers, ... @@ -527,16 +530,16 @@ F4_cheng = 1.184; % reported values of Fs F4_li = 1.197; -data = dlmread('../data files/Ex4_ChengEtAl2007.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex4_ChengEtAl2007.surf')'; % read in slip surfaces slip4_cheng = data(1:2,:); slip4_chengVert = MatchSlice (slip4_cheng, VertInspect); -data = dlmread('../data files/Ex4_LiEtAl2010.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex4_LiEtAl2010.surf')'; % read in slip surfaces slip4_li = data(1:2,:); slip4_liVert = MatchSlice (slip4_li, VertInspect); -[params_layers, params_piez, ltor] = RecieveInput('../data files/Ex4.dat'); +[params_layers, params_piez, ltor] = RecieveInput('./dataFiles/Ex4.dat'); strat = params_layers.strat; params_load = struct('Kc',0, 'Q',[], 'omega',[]); @@ -598,16 +601,16 @@ F5_pham = 1.413; % reported values of Fs F5_li = 1.408; -data = dlmread('../data files/Ex5_PhamFredlund2003.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex5_PhamFredlund2003.surf')'; % read in slip surfaces slip5_pham = data(1:2,:); slip5_phamVert = MatchSlice (slip5_pham, VertInspect); -data = dlmread('../data files/Ex5_LiEtAl2010.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex5_LiEtAl2010.surf')'; % read in slip surfaces slip5_li = data(1:2,:); slip5_liVert = MatchSlice (slip5_li, VertInspect); -[params_layers, params_piez, ltor] = RecieveInput('../data files/Ex2.dat'); +[params_layers, params_piez, ltor] = RecieveInput('./dataFiles/Ex2.dat'); strat = params_layers.strat; params_load = struct('Kc',0, 'Q',[], 'omega',[]); @@ -669,16 +672,16 @@ F6_pham = 1.000; % reported values of Fs F6_li = 1.017; -data = dlmread('../data files/Ex6_PhamFredlund2003.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex6_PhamFredlund2003.surf')'; % read in slip surfaces slip6_pham = data(1:2,:); slip6_phamVert = MatchSlice (slip6_pham, VertInspect); -data = dlmread('../data files/Ex6_LiEtAl2010.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex6_LiEtAl2010.surf')'; % read in slip surfaces slip6_li = data(1:2,:); slip6_liVert = MatchSlice (slip6_li, VertInspect); -[params_layers, params_piez, ltor] = RecieveInput('../data files/Ex6.dat'); +[params_layers, params_piez, ltor] = RecieveInput('./dataFiles/Ex6.dat'); strat = params_layers.strat; params_load = struct('Kc',0, 'Q',[], 'omega',[]); @@ -739,12 +742,12 @@ F7_fred = 1.245; % reported values of Fs -data = dlmread('../data files/FredlundKrahn1977_noncirc.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/FredlundKrahn1977_noncirc.surf')'; % read in slip surfaces slip7_fred = data(1:2,:); slip7_fredVert = MatchSlice (slip7_fred, VertInspect); -[params_layers, params_piez, ltor] = RecieveInput('../data files/FredlundKrahn1977.dat'); +[params_layers, params_piez, ltor] = RecieveInput('./dataFiles/FredlundKrahn1977.dat'); strat = params_layers.strat; params_load = struct('Kc',0, 'Q',[], 'omega',[]); @@ -877,5 +880,4 @@ r = sqrt ( del_x^2 + del_y^2 ); sum_r = sum_r + r; end -end - +end \ No newline at end of file