Changeset 24096

Timestamp:

07/16/19 17:01:27 (6 years ago)

Author:

schlegel

Message:

CHG: update nye check for 3 steps and add python tests

Location:

issm/trunk-jpl

Files:

• src/m/materials/nye.py (modified) (1 diff)
• test/Archives/Archive346.arch (modified) ( previous)
• test/Archives/Archive347.arch (modified) ( previous)
• test/NightlyRun/test346.m (modified) (2 diffs)
• test/NightlyRun/test346.py (added)
• test/NightlyRun/test347.m (modified) (3 diffs)
• test/NightlyRun/test347.py (added)
• test/Par/SquareSheetConstrained.py (modified) (1 diff)
• test/Par/SquareSheetConstrainedCO2.par (modified) (2 diffs)
• test/Par/SquareSheetConstrainedCO2.py (added)

issm/trunk-jpl/src/m/materials/nye.py ¶

@@ -29 +29 @@
         if ice_type == 1: # CO2 ice
                 A_const = 10**(10.8) # s^-1 MPa
-                Q = 63000 # J mol^-1
-                n = 7 # Glen's exponent
+                Q = 63000. # J mol^-1
+                n = 7. # Glen's exponent
 
         if ice_type == 2: # H2O ice
                 A_const = 9*10**4 # s^-1 MPa
-                Q = 60000 #  J mol^-1
-                n = 3 # Glen's exponent
+                Q = 60000. #  J mol^-1
+                n = 3. # Glen's exponent
 
         A = A_const*np.exp(-1*Q/(T*Rg)) # s^-1 MPa

issm/trunk-jpl/test/NightlyRun/test346.m ¶

@@ -1 @@
-%Test Name: SquareSheetConstrainedTherTranNyeCO2
+%Test Name: SquareSheetConstrainedTherTranNyeH2O 
 md=triangle(model(),'../Exp/Square.exp',180000.);
 md=setmask(md,'','');
@@ -16 +16 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Temperature','BasalforcingsGroundediceMeltingRate'};
-field_tolerances={1e-13,1e-13};
+field_names     ={'Temperature1','BasalforcingsGroundediceMeltingRate1',...
+        'Temperature3','BasalforcingsGroundediceMeltingRate3'};
+field_tolerances={1e-13,1e-13,1e-13,1e-13}; 
 field_values={...
         (md.results.TransientSolution(1).Temperature),...
         (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
+        (md.results.TransientSolution(3).Temperature),...
+        (md.results.TransientSolution(3).BasalforcingsGroundediceMeltingRate),...
         };

issm/trunk-jpl/test/NightlyRun/test347.m ¶

@@ -3 +3 @@
 md=setmask(md,'','');
 md=parameterize(md,'../Par/SquareSheetConstrained.par');
-md.materials.rheology_B=nye(md.initialization.temperature,2);
 md=extrude(md,3,1.);
 md=setflowequation(md,'SSA','all');
@@ -9 +8 @@
 md.verbose=verbose('convergence',true,'solution',true);
 md.materials.rheology_law = 'NyeH2O';
+md.materials.rheology_B=nye(md.initialization.temperature,2)
+
 md.transient.isstressbalance=0;
 md.transient.ismasstransport=0;
@@ -17 +18 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Temperature','BasalforcingsGroundediceMeltingRate'};
-field_tolerances={1e-13,1e-13};
+field_names     ={'Temperature1','BasalforcingsGroundediceMeltingRate1',...
+        'Temperature3','BasalforcingsGroundediceMeltingRate3'};
+field_tolerances={1e-13,1e-13,1e-13,1e-13}; 
 field_values={...
         (md.results.TransientSolution(1).Temperature),...
         (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
+        (md.results.TransientSolution(3).Temperature),...
+        (md.results.TransientSolution(3).BasalforcingsGroundediceMeltingRate),...
         };

issm/trunk-jpl/test/Par/SquareSheetConstrained.py ¶

@@ -24 +24 @@
 x         = np.array(archread('../Data/SquareSheetConstrained.arch','x'))
 y         = np.array(archread('../Data/SquareSheetConstrained.arch','y'))
-vx        = np.array(archread('../Data/SquareSheetConstrained.arch','vx'));
-vy        = np.array(archread('../Data/SquareSheetConstrained.arch','vy'));
-index     = archread('../Data/SquareSheetConstrained.arch','index').astype(int);
+vx        = np.array(archread('../Data/SquareSheetConstrained.arch','vx'))
+vy        = np.array(archread('../Data/SquareSheetConstrained.arch','vy'))
+index     = archread('../Data/SquareSheetConstrained.arch','index').astype(int)
 
 md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y)[0]

issm/trunk-jpl/test/Par/SquareSheetConstrainedCO2.par ¶

@@ -20 +20 @@
 xmax=max(md.mesh.x);
 md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin)+0.1*(hmin-hmax)*(md.mesh.x-xmin)/(xmax-xmin);
-md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
+md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness+20.;
 md.geometry.surface=md.geometry.base+md.geometry.thickness;
-md.geometry.bed=md.geometry.base-10;
 
 %Initial velocity 
@@ -69 +68 @@
 md.timestepping.time_step=1;
 md.timestepping.final_time=3;
+md.groundingline.migration='None';
 
 %Deal with boundary conditions: