diff --git a/CaseStudies/ssp/test/SSA_InputTester.m b/CaseStudies/ssp/test/SSA_InputTester.m index 6ee07190..315af496 100644 --- a/CaseStudies/ssp/test/SSA_InputTester.m +++ b/CaseStudies/ssp/test/SSA_InputTester.m @@ -30,7 +30,7 @@ % % Ex3.dat -SSA_InputSpecial ( '../data files/Ex3.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Ex3.dat', 0 ); %% % % \\ \hline @@ -47,14 +47,14 @@ % % Error_WrongNumLayerslow.dat --> 2 layers, file says 1 -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Error_NumLayerslow.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Error_NumLayerslow.dat', 0 ); %% % % \\ \cline{2-3} & overstate & % % Error_NumLayershigh.dat --> 2 layers, file says 3 -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Error_NumLayershigh.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Error_NumLayershigh.dat', 0 ); %% % % \\ \hline @@ -70,14 +70,14 @@ % % Error_NumStratPointslow.dat --> 5 points, file says 4, layer 1 -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Error_NumStratPointslow.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Error_NumStratPointslow.dat', 0 ); %% % % \\ \cline{2-3} & overstate & % % Error_NumStratPointshigh.dat --> 5 points, file says 6, layer 2 -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Error_NumStratPointshigh.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Error_NumStratPointshigh.dat', 0 ); %% % % \\ \hline @@ -94,14 +94,14 @@ % % Error_MissingSoilData.dat -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Error_MissingSoilData.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Error_MissingSoilData.dat', 0 ); %% % % \\ \cline{2-3} & extra properties & % % Error_ExtraSoilData.dat -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Error_ExtraSoilData.dat', 0); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Error_ExtraSoilData.dat', 0); %% % % \\ \hline @@ -117,14 +117,14 @@ % % Error_ltor_lefttoright.dat -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Error_ltor_lefttoright.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Error_ltor_lefttoright.dat', 0 ); %% % % \\ \cline{2-3} & right to left & % % Error_ltor_righttoleft.dat -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Error_ltor_righttoleft.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Error_ltor_righttoleft.dat', 0 ); %% % % \\ \hline @@ -141,14 +141,14 @@ % % Error_nonmotonic_layer.dat -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Error_nonmotonic_layer.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Error_nonmotonic_layer.dat', 0 ); %% % % \\ \cline{2-3} & piezometric surface & % % Error_nonmotonic_piez.dat -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Error_nonmotonic_piez.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Error_nonmotonic_piez.dat', 0 ); %% % % \\ \hline @@ -165,14 +165,14 @@ % % Error_xrange_layerendhigh.dat -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Error_xrange_layerendhigh.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Error_xrange_layerendhigh.dat', 0 ); %% % % \\ \cline{2-3} & end vertice \newline - low & % % Error_xrange_layerendlow.dat -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Error_xrange_layerendlow.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Error_xrange_layerendlow.dat', 0 ); %% % @@ -180,14 +180,14 @@ % % Error_xrange_layerendlow.dat -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Error_xrange_layerstarthigh.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Error_xrange_layerstarthigh.dat', 0 ); %% % % \\ \cline{2-3} & start vertice \newline - low & % % Error_xrange_layerendlow.dat -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Error_xrange_layerstartlow.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Error_xrange_layerstartlow.dat', 0 ); %% % % \\ \hline @@ -204,14 +204,14 @@ % % Error_xrange_piezendhigh.dat -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Error_xrange_piezendhigh.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Error_xrange_piezendhigh.dat', 0 ); %% % % \\ \cline{2-3} & end vertice \newline - low & % % Error_xrange_piezendlow.dat -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Error_xrange_piezendlow.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Error_xrange_piezendlow.dat', 0 ); %% % @@ -219,14 +219,14 @@ % % Error_xrange_piezendlow.dat -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Error_xrange_piezstarthigh.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Error_xrange_piezstarthigh.dat', 0 ); %% % % \\ \cline{2-3} & start vertice \newline - low & % % Error_xrange_piezendlow.dat -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Error_xrange_piezstartlow.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Error_xrange_piezstartlow.dat', 0 ); %% % % \\ \hline @@ -243,14 +243,14 @@ % % Constraint_phihigh.dat -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Constraint_phihigh.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Constraint_phihigh.dat', 0 ); %% % % \\ \cline{2-3} & $< 90$ & % % Constraint_philow.dat -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Constraint_philow.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Constraint_philow.dat', 0 ); %% % % \\ \hline @@ -266,7 +266,7 @@ % % Constraint_coh.dat -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Constraint_coh.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Constraint_coh.dat', 0 ); %% % % \\ \hline @@ -282,7 +282,7 @@ % % Constraint_gam.dat -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Constraint_gam.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Constraint_gam.dat', 0 ); %% % % \\ \hline @@ -298,7 +298,7 @@ % % Constraint_gams.dat -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Constraint_gams.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Constraint_gams.dat', 0 ); %% % % \\ \hline @@ -315,14 +315,14 @@ % % Constraint_nuhigh.dat -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Constraint_nuhigh.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Constraint_nuhigh.dat', 0 ); %% % % \\ \cline{2-3} & $< 0$ & % % Constraint_nulow.dat -SSA_InputSpecial ( '../data files/Faulty_Input_Files/Constraint_nulow.dat', 0 ); +SSA_InputSpecial ( './dataFiles/Faulty_Input_Files/Constraint_nulow.dat', 0 ); %% % % \\ \hline diff --git a/CaseStudies/ssp/test/SSA_MPSliceTester.m b/CaseStudies/ssp/test/SSA_MPSliceTester.m index c3c3f5d9..421506e5 100644 --- a/CaseStudies/ssp/test/SSA_MPSliceTester.m +++ b/CaseStudies/ssp/test/SSA_MPSliceTester.m @@ -37,16 +37,16 @@ % ----------------- % -[params_layers, params_piezYes, ltor] = RecieveInput('../data files/FredlundKrahn1977.dat'); +[params_layers, params_piezYes, ltor] = RecieveInput('./dataFiles/FredlundKrahn1977.dat'); params_load = struct('Kc',0, 'Q',[], 'omega',[]); params_soln = struct ('ftype',0,'ltor',ltor); params_piezNo = struct('piez',[],'gamw',0); -data = dlmread('../data files/FredlundKrahn1977_circ.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/FredlundKrahn1977_circ.surf')'; % read in slip surfaces slipc = data(1:2,:); -data = dlmread('../data files/FredlundKrahn1977_noncirc.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/FredlundKrahn1977_noncirc.surf')'; % read in slip surfaces slipnc = data(1:2,:); [ECD] = SSA_SliceTesterAlgorithm (@MorgPriceSolver, slipc, params_layers, params_piezNo, params_soln, params_load, 2.074, nStar); % compute F and lam for circular surface, dry slope @@ -181,34 +181,34 @@ % -[params_layers, params_piez, ltor] = RecieveInput('../data files/Ex1.dat'); +[params_layers, params_piez, ltor] = RecieveInput('./dataFiles/Ex1.dat'); params_soln = struct ('ftype',0,'ltor',ltor); Q = []; omega = []; -data = dlmread('../data files/Ex1_Greco1996.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex1_Greco1996.surf')'; % read in slip surfaces slip = data(1:2,:); Kc = data(3,1); params_load = struct('Kc',Kc, 'Q',Q, 'omega',omega); [EG1]= SSA_SliceTesterAlgorithm (@MorgPriceSolver, slip, params_layers, params_piez, params_soln, params_load, 1.327, nStar); % compute F and lam for slip surface -data = dlmread('../data files/Ex1_MalkawiEtAl2001.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex1_MalkawiEtAl2001.surf')'; % read in slip surfaces slip = data(1:2,:); Kc = data(3,1); params_load = struct('Kc',Kc, 'Q',Q, 'omega',omega); [EM1]= SSA_SliceTesterAlgorithm (@MorgPriceSolver, slip, params_layers, params_piez, params_soln, params_load,1.238,nStar); % compute F and lam for slip surface -data = dlmread('../data files/Ex1_ChengEtAl2007.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex1_ChengEtAl2007.surf')'; % read in slip surfaces slip = data(1:2,:); Kc = data(3,1); params_load = struct('Kc',Kc, 'Q',Q, 'omega',omega); [EC1]= SSA_SliceTesterAlgorithm (@MorgPriceSolver, slip, params_layers, params_piez, params_soln, params_load,1.325,nStar); % compute F and lam for slip surface -data = dlmread('../data files/Ex1_LiEtAl2010.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex1_LiEtAl2010.surf')'; % read in slip surfaces slip = data(1:2,:); Kc = data(3,1); params_load = struct('Kc',Kc, 'Q',Q, 'omega',omega); @@ -232,24 +232,24 @@ % ----------------- % -[params_layers, params_piez, ltor] = RecieveInput('../data files/Ex2.dat'); +[params_layers, params_piez, ltor] = RecieveInput('./dataFiles/Ex2.dat'); params_soln = struct ('ftype',0,'ltor',ltor); -data = dlmread('../data files/Ex2_ZolfaghariEtAl2005.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex2_ZolfaghariEtAl2005.surf')'; % read in slip surfaces slip = data(1:2,:); Kc = data(3,1); params_load = struct('Kc',Kc, 'Q',Q, 'omega',omega); [EZ2] = SSA_SliceTesterAlgorithm (@MorgPriceSolver, slip, params_layers, params_piez, params_soln, params_load, 1.240, nStar); % compute F and lam for slip surface -data = dlmread('../data files/Ex2_ChengEtAl2007.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex2_ChengEtAl2007.surf')'; % read in slip surfaces slip = data(1:2,:); Kc = data(3,1); params_load = struct('Kc',Kc, 'Q',Q, 'omega',omega); [EC2] = SSA_SliceTesterAlgorithm (@MorgPriceSolver,slip,params_layers, params_piez, params_soln, params_load,1.101,nStar); % compute F and lam for slip surface -data = dlmread('../data files/Ex2_LiEtAl2010.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex2_LiEtAl2010.surf')'; % read in slip surfaces slip = data(1:2,:); Kc = data(3,1); params_load = struct('Kc',Kc, 'Q',Q, 'omega',omega); @@ -271,24 +271,24 @@ % ----------------- % -[params_layers, params_piez, ltor] = RecieveInput('../data files/Ex3.dat'); +[params_layers, params_piez, ltor] = RecieveInput('./dataFiles/Ex3.dat'); params_soln = struct ('ftype',0,'ltor',ltor); -data = dlmread('../data files/Ex3_ZolfaghariEtAl2005.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex3_ZolfaghariEtAl2005.surf')'; % read in slip surfaces slip = data(1:2,:); Kc = data(3,1); params_load = struct('Kc',Kc, 'Q',Q, 'omega',omega); [EZ3] = SSA_SliceTesterAlgorithm (@MorgPriceSolver,slip,params_layers, params_piez, params_soln, params_load,1.48,nStar); % compute F and lam for slip surface -data = dlmread('../data files/Ex3_ChengEtAl2007.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex3_ChengEtAl2007.surf')'; % read in slip surfaces slip = data(1:2,:); Kc = data(3,1); params_load = struct('Kc',Kc, 'Q',Q, 'omega',omega); [EC3] = SSA_SliceTesterAlgorithm (@MorgPriceSolver, slip, params_layers, params_piez, params_soln, params_load,1.349,nStar); % compute F and lam for slip surface -data = dlmread('../data files/Ex3_LiEtAl2010.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex3_LiEtAl2010.surf')'; % read in slip surfaces slip = data(1:2,:); Kc = data(3,1); params_load = struct('Kc',Kc, 'Q',Q, 'omega',omega); @@ -310,17 +310,17 @@ % ----------------- % -[params_layers, params_piez, ltor] = RecieveInput('../data files/Ex4.dat'); +[params_layers, params_piez, ltor] = RecieveInput('./dataFiles/Ex4.dat'); params_soln = struct ('ftype',0,'ltor',ltor); -data = dlmread('../data files/Ex4_ChengEtAl2007.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex4_ChengEtAl2007.surf')'; % read in slip surfaces slip = data(1:2,:); Kc = data(3,1); params_load = struct('Kc',Kc, 'Q',Q, 'omega',omega); [EC4] = SSA_SliceTesterAlgorithm (@MorgPriceSolver, slip, params_layers, params_piez, params_soln, params_load,1.184,nStar);% compute F and lam for slip surface -data = dlmread('../data files/Ex4_LiEtAl2010.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex4_LiEtAl2010.surf')'; % read in slip surfaces slip = data(1:2,:); Kc = data(3,1); params_load = struct('Kc',Kc, 'Q',Q, 'omega',omega); @@ -340,25 +340,25 @@ % ----------------- % -[params_layers, params_piez, ltor] = RecieveInput('../data files/Ex5.dat'); +[params_layers, params_piez, ltor] = RecieveInput('./dataFiles/Ex5.dat'); params_soln = struct ('ftype',0,'ltor',ltor); -data = dlmread('../data files/Ex5_PhamFredlund2003.surf')';% read in slip surfaces +data = dlmread('./dataFiles/Ex5_PhamFredlund2003.surf')';% read in slip surfaces slip = data(1:2,:); Kc = data(3,1); params_load = struct('Kc',Kc, 'Q',Q, 'omega',omega); [EPD5] = SSA_SliceTesterAlgorithm (@MorgPriceSolver, slip, params_layers, params_piez, params_soln, params_load,1.413,nStar); % compute F and lam for slip surface -data = dlmread('../data files/Ex5_PhamFredlund2003_circ.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex5_PhamFredlund2003_circ.surf')'; % read in slip surfaces slip = data(1:2,:); Kc = data(3,1); params_load = struct('Kc',Kc, 'Q',Q, 'omega',omega); [EPC5] = SSA_SliceTesterAlgorithm (@MorgPriceSolver, slip, params_layers, params_piez, params_soln, params_load,1.485,nStar); % compute F and lam for slip surface -data = dlmread('../data files/Ex5_LiEtAl2010.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex5_LiEtAl2010.surf')'; % read in slip surfaces slip = data(1:2,:); Kc = data(3,1); params_load = struct('Kc',Kc, 'Q',Q, 'omega',omega); @@ -389,24 +389,24 @@ % iterations. % -[params_layers, params_piez, ltor] = RecieveInput('../data files/Ex6.dat'); +[params_layers, params_piez, ltor] = RecieveInput('./dataFiles/Ex6.dat'); params_soln = struct ('ftype',0,'ltor',ltor); -data = dlmread('../data files/Ex6_PhamFredlund2003.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex6_PhamFredlund2003.surf')'; % read in slip surfaces slipPD = data(1:2,:); KcPD = data(3,1); params_load = struct('Kc',KcPD, 'Q',[], 'omega',[]); [EPD6] = SSA_SliceTesterAlgorithm (@MorgPriceSolver,slipPD,params_layers, params_piez, params_soln, params_load,1.000,nStar); % compute F and lam for slip surface -data = dlmread('../data files/Ex6_PhamFredlund2003_circ.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex6_PhamFredlund2003_circ.surf')'; % read in slip surfaces slipPC = data(1:2,:); KcPC = data(3,1); params_load = struct('Kc',KcPC, 'Q',[], 'omega',[]); [EPC6] = SSA_SliceTesterAlgorithm (@MorgPriceSolver,slipPC,params_layers, params_piez, params_soln, params_load,1.140,nStar); % compute F and lam for slip surface -data = dlmread('../data files/Ex6_LiEtAl2010.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex6_LiEtAl2010.surf')'; % read in slip surfaces slipL = data(1:2,:); KcL = data(3,1); params_load = struct('Kc',KcL, 'Q',[], 'omega',[]); diff --git a/CaseStudies/ssp/test/SSA_RFEMSliceTester.m b/CaseStudies/ssp/test/SSA_RFEMSliceTester.m index 54f49c79..0406a321 100644 --- a/CaseStudies/ssp/test/SSA_RFEMSliceTester.m +++ b/CaseStudies/ssp/test/SSA_RFEMSliceTester.m @@ -39,10 +39,10 @@ % -[params_layers, params_piez, ltor] = RecieveInput('../data files/Ex1.dat'); +[params_layers, params_piez, ltor] = RecieveInput('./dataFiles/Ex1.dat'); params_soln = struct('ltor',ltor,'ftype',0); -data = dlmread('../data files/Ex1_RFEM_30slice.surf')'; % read in slip surfaces +data = dlmread('./dataFiles/Ex1_RFEM_30slice.surf')'; % read in slip surfaces slip = data(1:2,:); Kc = data(3,1); params_load = struct('Kc',Kc, 'Q',Q, 'omega',omega); @@ -124,11 +124,11 @@ % -[params_layers, params_piez, ltor] = RecieveInput('../data files/Ex2.dat'); +[params_layers, params_piez, ltor] = RecieveInput('./dataFiles/Ex2.dat'); params_soln = struct('ltor',ltor,'ftype',0); data = ... % read in slip surfaces - dlmread('../data files/Ex2_RFEM.surf')'; + dlmread('./dataFiles/Ex2_RFEM.surf')'; slip = data(1:2,:); Kc = data(3,1); params_load = struct('Kc',Kc, 'Q',Q, 'omega',omega); @@ -153,12 +153,12 @@ % ----------------- % -[params_layers, params_piez, ltor] = RecieveInput('../data files/Ex2.dat'); +[params_layers, params_piez, ltor] = RecieveInput('./dataFiles/Ex2.dat'); params_soln = struct('ltor',ltor,'ftype',0); data = ... % read in slip surfaces - dlmread('../data files/Ex6_RFEM.surf')'; + dlmread('./dataFiles/Ex6_RFEM.surf')'; slip = data(1:2,:); Kc = data(3,1); params_load = struct('Kc',Kc, 'Q',Q, 'omega',omega);