Changeset 20629

Timestamp:

05/20/16 11:20:16 (9 years ago)

Author:

jbondzio

Message:

ADD: NR for CuffeyTemperate rheology

Location:

issm/trunk-jpl/test

Files:

• Archives/Archive436.nc (modified) ( previous)
• NightlyRun/test436.m (modified) (2 diffs)

issm/trunk-jpl/test/NightlyRun/test436.m

@@ -1 @@
-%Test Name: SquareSheetShelfSteaEnthalpyLliboutryDuvalHO
+%Test Name: SquareSheetShelfSteaEnthalpyRheologiesHO
 md=triangle(model(),'../Exp/Square.exp',150000.);
 md=setmask(md,'../Exp/SquareShelf.exp','');
@@ -8 +8 @@
 md.timestepping.time_step=0.;
 md.thermal.isenthalpy=1;
-md.materials.rheology_law='LliboutryDuval';
 md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1);
 md.initialization.watercolumn=zeros(md.mesh.numberofvertices,1);
-md=solve(md,SteadystateSolutionEnum());
 
-%Fields and tolerances to track changes
-field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','Waterfraction','Enthalpy'};
-field_tolerances={2e-09,1e-09,1e-09,1e-09,1e-13,1e-10,5e-10,5e-10};
-field_values={...
-        (md.results.SteadystateSolution.Vx),...
-        (md.results.SteadystateSolution.Vy),...
-        (md.results.SteadystateSolution.Vz),...
-        (md.results.SteadystateSolution.Vel),...
-        (md.results.SteadystateSolution.Pressure),...
-        (md.results.SteadystateSolution.Temperature),...
-        (md.results.SteadystateSolution.Waterfraction),...
-        (md.results.SteadystateSolution.Enthalpy),...
-        };
+%Go solve
+field_names={};
+field_tolerances={};
+field_values={};
+for i={'LliboutryDuval', 'CuffeyTemperate'}
+        disp(' ');
+        disp(['====== Testing rheology law: ' i{1} ' =====']);
+
+        md.materials.rheology_law=i{1};
+        md=solve(md,SteadystateSolutionEnum());
+        field_names     ={field_names{:},['Vx' i{1}],['Vy' i{1}],['Vz' i{1}],['Vel' i{1}],['Pressure' i{1}],...
+                ['Temperature' i{1}],['Waterfraction' i{1}],['Enthalpy' i{1}]};
+        field_tolerances={field_tolerances{:},2e-09,1e-09,1e-09,1e-09,1e-13,1e-10,5e-10,5e-10};
+        field_values={field_values{:},...
+                (md.results.SteadystateSolution.Vx),...
+                (md.results.SteadystateSolution.Vy),...
+                (md.results.SteadystateSolution.Vz),...
+                (md.results.SteadystateSolution.Vel),...
+                (md.results.SteadystateSolution.Pressure),...
+                (md.results.SteadystateSolution.Temperature),...
+                (md.results.SteadystateSolution.Waterfraction),...
+                (md.results.SteadystateSolution.Enthalpy),...
+                };
+end