Changeset 13519

Timestamp:

10/03/12 09:51:31 (12 years ago)

Author:

jschierm

Message:

NEW: Working python tests 213-215.

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test212.py (modified) (1 diff)
• test213.py (moved) (moved from issm/trunk-jpl/test/NightlyRun/InNeedOfDebugging/test213.py ) (2 diffs)
• test214.m (modified) (1 diff)
• test214.py (moved) (moved from issm/trunk-jpl/test/NightlyRun/InNeedOfDebugging/test214.py ) (2 diffs)
• test215.m (modified) (1 diff)
• test215.py (moved) (moved from issm/trunk-jpl/test/NightlyRun/InNeedOfDebugging/test215.py ) (2 diffs)

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

@@ -32 +32 @@
 md.inversion.control_parameters=['MaterialsRheologyBbar']
 md.inversion.min_parameters=10**6*ones((md.mesh.numberofvertices,1))
-md.inversion.max_parameters=2*10**9*ones((md.mesh.numberofvertices,1))
+md.inversion.max_parameters=2.*10**9*ones((md.mesh.numberofvertices,1))
 md.inversion.nsteps=2
-md.inversion.cost_functions=101*ones((md.inversion.nsteps,1))
+md.inversion.cost_functions=101.*ones((md.inversion.nsteps,1))
 md.inversion.cost_functions_coefficients=ones((md.mesh.numberofvertices,1))
 md.inversion.gradient_scaling=10**7*ones((md.inversion.nsteps,1))
-md.inversion.maxiter_per_step=2*ones((md.inversion.nsteps,1))
+md.inversion.maxiter_per_step=2.*ones((md.inversion.nsteps,1))
 md.inversion.step_threshold=0.3*ones((md.inversion.nsteps,1))
 md.inversion.vx_obs=md.initialization.vx

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

@@ -32 +32 @@
 md.inversion.iscontrol=1
 md.inversion.control_parameters=['MaterialsRheologyBbar']
-md.inversion.min_parameters=10^6*ones(md.mesh.numberofvertices,1)
-md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1)
+md.inversion.min_parameters=10**6*ones((md.mesh.numberofvertices,1))
+md.inversion.max_parameters=2.*10**9*ones((md.mesh.numberofvertices,1))
 md.inversion.nsteps=2
-md.inversion.cost_functions=101*ones(md.inversion.nsteps,1)
-md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1)
-md.inversion.gradient_scaling=10^7*ones(md.inversion.nsteps,1)
-md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1)
-md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1)
+md.inversion.cost_functions=101.*ones((md.inversion.nsteps,1))
+md.inversion.cost_functions_coefficients=ones((md.mesh.numberofvertices,1))
+md.inversion.gradient_scaling=10**7*ones((md.inversion.nsteps,1))
+md.inversion.maxiter_per_step=2.*ones((md.inversion.nsteps,1))
+md.inversion.step_threshold=0.3*ones((md.inversion.nsteps,1))
 md.inversion.vx_obs=md.initialization.vx
 md.inversion.vy_obs=md.initialization.vy
@@ -50 +50 @@
 # Fields and tolerances to track changes
 
-field_names     =['Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy']
+field_names     =['Gradient','Misfits','MaterialsRheologyBbar','Pressure','Vel','Vx','Vy']
 field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]
 #field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]

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

@@ -26 +26 @@
 field_values={...
         (md.results.DiagnosticSolution.Gradient1),...
-        md.results.DiagnosticSolution.J,...
+        (md.results.DiagnosticSolution.J),...
         (md.results.DiagnosticSolution.MaterialsRheologyB),...
         (md.results.DiagnosticSolution.Pressure),...

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

@@ -32 +32 @@
 md.inversion.iscontrol=1
 md.inversion.control_parameters=['MaterialsRheologyBbar']
-md.inversion.min_parameters=10^6*ones(md.mesh.numberofvertices,1)
-md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1)
+md.inversion.min_parameters=10**6*ones((md.mesh.numberofvertices,1))
+md.inversion.max_parameters=2.*10**9*ones((md.mesh.numberofvertices,1))
 md.inversion.nsteps=2
-md.inversion.cost_functions=101*ones(md.inversion.nsteps,1)
-md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1)
-md.inversion.gradient_scaling=10^7*ones(md.inversion.nsteps,1)
-md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1)
-md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1)
-md.inversion.vx_obs=md.initialization.vx md.inversion.vy_obs=md.initialization.vy
+md.inversion.cost_functions=101.*ones((md.inversion.nsteps,1))
+md.inversion.cost_functions_coefficients=ones((md.mesh.numberofvertices,1))
+md.inversion.gradient_scaling=10**7*ones((md.inversion.nsteps,1))
+md.inversion.maxiter_per_step=2.*ones((md.inversion.nsteps,1))
+md.inversion.step_threshold=0.3*ones((md.inversion.nsteps,1))
+md.inversion.vx_obs=md.initialization.vx
+md.inversion.vy_obs=md.initialization.vy
 
 
@@ -49 +50 @@
 # Fields and tolerances to track changes
 
-field_names     =['Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy']
+field_names     =['Gradient','Misfits','MaterialsRheologyBbar','Pressure','Vel','Vx','Vy']
 field_tolerances=[1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08]
 field_values=[\
-        md.results['DiagnosticSolution.Gradient1),\
-        md.results.DiagnosticSolution.J,\
-        md.results['DiagnosticSolution.MaterialsRheologyB),\
+        md.results['DiagnosticSolution'][1]['Gradient1'],\
+        md.results['DiagnosticSolution'][1]['J'],\
+        md.results['DiagnosticSolution'][1]['MaterialsRheologyB'],\
         md.results['DiagnosticSolution'][1]['Pressure'],\
         md.results['DiagnosticSolution'][1]['Vel'],\

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

@@ -26 +26 @@
 field_values={...
         (md.results.DiagnosticSolution.Gradient1),...
-        md.results.DiagnosticSolution.J,...
+        (md.results.DiagnosticSolution.J),...
         (md.results.DiagnosticSolution.MaterialsRheologyB),...
         (md.results.DiagnosticSolution.Pressure),...

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

@@ -32 +32 @@
 md.inversion.iscontrol=1
 md.inversion.control_parameters=['MaterialsRheologyBbar']
-md.inversion.min_parameters=10^6*ones(md.mesh.numberofvertices,1)
-md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1)
+md.inversion.min_parameters=10**6*ones((md.mesh.numberofvertices,1))
+md.inversion.max_parameters=2.*10**9*ones((md.mesh.numberofvertices,1))
 md.inversion.nsteps=2
-md.inversion.cost_functions=101*ones(md.inversion.nsteps,1)
-md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1)
-md.inversion.gradient_scaling=10^7*ones(md.inversion.nsteps,1)
-md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1)
-md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1)
-md.inversion.vx_obs=md.initialization.vx md.inversion.vy_obs=md.initialization.vy
+md.inversion.cost_functions=101.*ones((md.inversion.nsteps,1))
+md.inversion.cost_functions_coefficients=ones((md.mesh.numberofvertices,1))
+md.inversion.gradient_scaling=10**7*ones((md.inversion.nsteps,1))
+md.inversion.maxiter_per_step=2.*ones((md.inversion.nsteps,1))
+md.inversion.step_threshold=0.3*ones((md.inversion.nsteps,1))
+md.inversion.vx_obs=md.initialization.vx
+md.inversion.vy_obs=md.initialization.vy
 
 
@@ -49 +50 @@
 # Fields and tolerances to track changes
 
-field_names     =['Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy']
+field_names     =['Gradient','Misfits','MaterialsRheologyBbar','Pressure','Vel','Vx','Vy']
 field_tolerances=[1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09]
 field_values=[\
-        md.results['DiagnosticSolution.Gradient1),\
-        md.results.DiagnosticSolution.J,\
-        md.results['DiagnosticSolution.MaterialsRheologyB),\
+        md.results['DiagnosticSolution'][1]['Gradient1'],\
+        md.results['DiagnosticSolution'][1]['J'],\
+        md.results['DiagnosticSolution'][1]['MaterialsRheologyB'],\
         md.results['DiagnosticSolution'][1]['Pressure'],\
         md.results['DiagnosticSolution'][1]['Vel'],\