Changeset 21580

Timestamp:

02/28/17 16:39:26 (8 years ago)

Author:

adhikari

Message:

CHG: GiaIvins switched back to Gia

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test2001.m (modified) (2 diffs)
• test2001.py (modified) (2 diffs)
• test2002.m (modified) (1 diff)
• test2051.m (modified) (2 diffs)
• test2052.m (modified) (1 diff)
• test2053.m (modified) (1 diff)
• test2071.m (modified) (1 diff)
• test2072.m (modified) (1 diff)
• test2073.m (modified) (1 diff)
• test2081.m (modified) (1 diff)
• test2082.m (modified) (1 diff)
• test2083.m (modified) (1 diff)

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

@@ -1 @@
-%Test Name: SquareSheetConstrainedGiaIvins2d
+%Test Name: SquareSheetConstrainedGia2d
 %GIA test, inspired on test101
 md=triangle(model(),'../Exp/Square.exp',100000.);
@@ -20 +20 @@
 md.cluster=generic('name',oshostname(),'np',3);
 md.verbose=verbose('1111111');
-md=solve(md,'GiaIvins');
+md=solve(md,'Gia');
 
 %Fields and tolerances to track changes
-field_names     ={'GiaIvinsW','GiaIvinsdWdt'};
+field_names     ={'GiaW','GiadWdt'};
 field_tolerances={1e-13,1e-13};
 field_values={...
-        (md.results.GiaIvinsSolution.GiaIvinsW),...
-        (md.results.GiaIvinsSolution.GiaIvinsdWdt),...
+        (md.results.GiaSolution.GiaW),...
+        (md.results.GiaSolution.GiadWdt),...
         };

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

@@ -1 @@
-#Test Name: SquareSheetConstrainedGiaIvins2d
+#Test Name: SquareSheetConstrainedGia2d
 import numpy as np
 import copy
@@ -31 +31 @@
 #Solve for GIA deflection 
 md.cluster=generic('name',gethostname(),'np',3)
-md=solve(md,'GiaIvins')
+md=solve(md,'Gia')
 
 #Fields and tolerances to track changes
-field_names     =['GiaIvinsW','GiaIvinsdWdt']
+field_names     =['GiaW','GiadWdt']
 field_tolerances=[1e-13,1e-13]
-field_values    =[md.results.GiaIvinsSolution.GiaIvinsW,
-                                                                        md.results.GiaIvinsSolution.GiaIvinsdWdt]
+field_values    =[md.results.GiaSolution.GiaW,
+                                                                        md.results.GiaSolution.GiadWdt]
 

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

@@ -44 +44 @@
 % }}}
 
+md.slr.ocean_area_scaling=0; 
+
 %geometry
 di=md.materials.rho_ice/md.materials.rho_water;

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

@@ -6 +6 @@
 
 %% indicate what you want to compute 
-md.giaivins.cross_section_shape=1;    % for square-edged x-section 
+md.gia.cross_section_shape=1;    % for square-edged x-section 
 
 %% define loading history 
@@ -22 +22 @@
 md.cluster=generic('name',oshostname(),'np',3);
 md.verbose=verbose('1111111');
-md=solve(md,'GiaIvins');
+md=solve(md,'Gia');
 
 %Fields and tolerances to track changes
-field_names     ={'GiaIvinsW','GiaIvinsdWdt'};
+field_names     ={'GiaW','GiadWdt'};
 field_tolerances={1e-13,1e-13};
 field_values={...
-        (md.results.GiaIvinsSolution.GiaIvinsW),...
-        (md.results.GiaIvinsSolution.GiaIvinsdWdt),...
+        (md.results.GiaSolution.GiaW),...
+        (md.results.GiaSolution.GiadWdt),...
         };

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

@@ -22 +22 @@
 md.cluster=generic('name',oshostname(),'np',3);
 md.verbose=verbose('1111111');
-md=solve(md,'GiaIvins');
+md=solve(md,'Gia');
 
 %Fields and tolerances to track changes
-field_names     ={'GiaIvinsW','GiaIvinsdWdt'};
+field_names     ={'GiaW','GiadWdt'};
 field_tolerances={1e-13,1e-13};
 field_values={...
-        (md.results.GiaIvinsSolution.GiaIvinsW),...
-        (md.results.GiaIvinsSolution.GiaIvinsdWdt),...
+        (md.results.GiaSolution.GiaW),...
+        (md.results.GiaSolution.GiadWdt),...
         };

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

@@ -22 +22 @@
 md.cluster=generic('name',oshostname(),'np',3);
 md.verbose=verbose('1111111');
-md=solve(md,'GiaIvins');
+md=solve(md,'Gia');
 
 %Fields and tolerances to track changes
-field_names     ={'GiaIvinsW','GiaIvinsdWdt'};
+field_names     ={'GiaW','GiadWdt'};
 field_tolerances={1e-13,1e-13};
 field_values={...
-        (md.results.GiaIvinsSolution.GiaIvinsW),...
-        (md.results.GiaIvinsSolution.GiaIvinsdWdt),...
+        (md.results.GiaSolution.GiaW),...
+        (md.results.GiaSolution.GiadWdt),...
         };

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

@@ -21 +21 @@
 md.cluster=generic('name',oshostname(),'np',3);
 md.verbose=verbose('1111111');
-md=solve(md,'GiaIvins');
+md=solve(md,'Gia');
 
 %Fields and tolerances to track changes
-field_names     ={'GiaIvinsW','GiaIvinsdWdt'};
+field_names     ={'GiaW','GiadWdt'};
 field_tolerances={1e-13,1e-13};
 field_values={...
-        (md.results.GiaIvinsSolution.GiaIvinsW),...
-        (md.results.GiaIvinsSolution.GiaIvinsdWdt),...
+        (md.results.GiaSolution.GiaW),...
+        (md.results.GiaSolution.GiadWdt),...
         };

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

@@ -21 +21 @@
 md.cluster=generic('name',oshostname(),'np',3);
 md.verbose=verbose('1111111');
-md=solve(md,'GiaIvins');
+md=solve(md,'Gia');
 
 %Fields and tolerances to track changes
-field_names     ={'GiaIvinsW','GiaIvinsdWdt'};
+field_names     ={'GiaW','GiadWdt'};
 field_tolerances={1e-13,1e-13};
 field_values={...
-        (md.results.GiaIvinsSolution.GiaIvinsW),...
-        (md.results.GiaIvinsSolution.GiaIvinsdWdt),...
+        (md.results.GiaSolution.GiaW),...
+        (md.results.GiaSolution.GiadWdt),...
         };

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

@@ -21 +21 @@
 md.cluster=generic('name',oshostname(),'np',3);
 md.verbose=verbose('1111111');
-md=solve(md,'GiaIvins');
+md=solve(md,'Gia');
 
 %Fields and tolerances to track changes
-field_names     ={'GiaIvinsW','GiaIvinsdWdt'};
+field_names     ={'GiaW','GiadWdt'};
 field_tolerances={1e-13,1e-13};
 field_values={...
-        (md.results.GiaIvinsSolution.GiaIvinsW),...
-        (md.results.GiaIvinsSolution.GiaIvinsdWdt),...
+        (md.results.GiaSolution.GiaW),...
+        (md.results.GiaSolution.GiadWdt),...
         };

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

@@ -21 +21 @@
 md.cluster=generic('name',oshostname(),'np',3);
 md.verbose=verbose('1111111');
-md=solve(md,'GiaIvins');
+md=solve(md,'Gia');
 
 %Fields and tolerances to track changes
-field_names     ={'GiaIvinsW','GiaIvinsdWdt'};
+field_names     ={'GiaW','GiadWdt'};
 field_tolerances={1e-13,1e-13};
 field_values={...
-        (md.results.GiaIvinsSolution.GiaIvinsW),...
-        (md.results.GiaIvinsSolution.GiaIvinsdWdt),...
+        (md.results.GiaSolution.GiaW),...
+        (md.results.GiaSolution.GiadWdt),...
         };

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

@@ -21 +21 @@
 md.cluster=generic('name',oshostname(),'np',3);
 md.verbose=verbose('1111111');
-md=solve(md,'GiaIvins');
+md=solve(md,'Gia');
 
 %Fields and tolerances to track changes
-field_names     ={'GiaIvinsW','GiaIvinsdWdt'};
+field_names     ={'GiaW','GiadWdt'};
 field_tolerances={1e-13,1e-13};
 field_values={...
-        (md.results.GiaIvinsSolution.GiaIvinsW),...
-        (md.results.GiaIvinsSolution.GiaIvinsdWdt),...
+        (md.results.GiaSolution.GiaW),...
+        (md.results.GiaSolution.GiadWdt),...
         };

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

@@ -21 +21 @@
 md.cluster=generic('name',oshostname(),'np',3);
 md.verbose=verbose('1111111');
-md=solve(md,'GiaIvins');
+md=solve(md,'Gia');
 
 %Fields and tolerances to track changes
-field_names     ={'GiaIvinsW','GiaIvinsdWdt'};
+field_names     ={'GiaW','GiadWdt'};
 field_tolerances={1e-13,1e-13};
 field_values={...
-        (md.results.GiaIvinsSolution.GiaIvinsW),...
-        (md.results.GiaIvinsSolution.GiaIvinsdWdt),...
+        (md.results.GiaSolution.GiaW),...
+        (md.results.GiaSolution.GiadWdt),...
         };