Changeset 14653

Timestamp:

04/19/13 09:46:13 (12 years ago)

Author:

seroussi

Message:

CHG: updated grounding line test for subelement2

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test423.m (modified) (2 diffs)
• test423.py (modified) (1 diff)

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

@@ -20 +20 @@
 md.transient.isthermal=0;
 md.transient.isprognostic=0;
-md.transient.isdiagnostic=0;
+md.transient.isdiagnostic=1;
 md.transient.isgroundingline=1;
 
@@ -27 +27 @@
 md=solve(md,TransientSolutionEnum());
 element_on_iceshelf_agressive=(md.results.TransientSolution.MaskElementonfloatingice);
+vel_agressive=(md.results.TransientSolution.Vel);
 
 md.groundingline.migration='SoftMigration';
 md=solve(md,TransientSolutionEnum());
 element_on_iceshelf_soft=(md.results.TransientSolution.MaskElementonfloatingice);
+vel_soft=(md.results.TransientSolution.Vel);
 
 md.groundingline.migration='SubelementMigration';
 md=solve(md,TransientSolutionEnum());
 element_on_iceshelf_subelement=(md.results.TransientSolution.GLlevelset);
+vel_subelement=(md.results.TransientSolution.Vel);
+
+md.groundingline.migration='SubelementMigration2';
+md=solve(md,TransientSolutionEnum());
+element_on_iceshelf_subelement2=(md.results.TransientSolution.GLlevelset);
+vel_subelement2=(md.results.TransientSolution.Vel);
 
 %Fields and tolerances to track changes
-field_names     ={'ElementOnIceShelfAgressive','ElementOnIceShelfSoft','ElementOnIceShelfSubelement'};
-field_tolerances={1e-13,1e-13,1e-13};
-field_values={element_on_iceshelf_agressive,element_on_iceshelf_soft,element_on_iceshelf_subelement};
+field_names     ={'ElementOnIceShelfAgressive','VelAgressive','ElementOnIceShelfSoft','VelSoft','ElementOnIceShelfSubelement','VelSubelement','ElementOnIceShelfSubelement2','VelSubelement2'};
+field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
+field_values={element_on_iceshelf_agressive,vel_agressive,element_on_iceshelf_soft,vel_soft,element_on_iceshelf_subelement,vel_subelement,element_on_iceshelf_subelement2,vel_subelement2};

issm/trunk-jpl/test/NightlyRun/test423.py

@@ -38 +38 @@
 md=solve(md,TransientSolutionEnum())
 element_on_iceshelf_agressive=md.results.TransientSolution[0].MaskElementonfloatingice
+vel_agressive=md.results.TransientSolution[0].Vel
 
 md.groundingline.migration='SoftMigration'
 md=solve(md,TransientSolutionEnum())
 element_on_iceshelf_soft=md.results.TransientSolution[0].MaskElementonfloatingice
+vel_soft=md.results.TransientSolution[0].Vel
 
 md.groundingline.migration='SubelementMigration'
 md=solve(md,TransientSolutionEnum())
 element_on_iceshelf_subelement=md.results.TransientSolution[0].GLlevelset
+vel_subelement=md.results.TransientSolution[0].Vel
+
+md.groundingline.migration='SubelementMigration2'
+md=solve(md,TransientSolutionEnum())
+element_on_iceshelf_subelement2=md.results.TransientSolution[0].GLlevelset
+vel_subelement2=md.results.TransientSolution[0].Vel
 
 #Fields and tolerances to track changes
-field_names     =['ElementOnIceShelfAgressive','ElementOnIceShelfSoft','ElementOnIceShelfSubelement']
-field_tolerances=[1e-13,1e-13,1e-13]
-field_values=[element_on_iceshelf_agressive,element_on_iceshelf_soft,element_on_iceshelf_subelement]
+field_names     =['ElementOnIceShelfAgressive','VelAgressive','ElementOnIceShelfSoft','VelSoft','ElementOnIceShelfSubelement','VelSubelement','ElementOnIceShelfSubelement2','VelSubelement2']
+field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]
+field_values=[element_on_iceshelf_agressive,vel_agressive,element_on_iceshelf_soft,vel_soft,element_on_iceshelf_subelement,vel_subelement,element_on_iceshelf_subelement2,vel_subelement2]