Changeset 13625

Timestamp:

10/11/12 11:56:43 (12 years ago)

Author:

jschierm

Message:

NEW: Working test270.py and test272.py (along with cosmetic matlab changes).

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test270.m (modified) (1 diff)
• test270.py (added)
• test272.m (modified) (4 diffs)
• test272.py (added)
• test274.m (modified) (2 diffs)

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

@@ -1 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
 md.materials=matdamageice();
 md.materials.rheology_B=paterson(md.initialization.temperature);
-md.materials.rheology_n=3*ones(md.mesh.numberofelements,1);
+md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1);
 md.materials.rheology_Z=0.5*ones(md.mesh.numberofvertices,1);
 md=setflowequation(md,'macayeal','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,DiagnosticSolutionEnum);
+md=solve(md,DiagnosticSolutionEnum());
 
 %Fields and tolerances to track changes

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

@@ -1 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');
 md.materials=matdamageice();
 md.materials.rheology_B=paterson(md.initialization.temperature);
-md.materials.rheology_n=3*ones(md.mesh.numberofelements,1);
+md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1);
 md.materials.rheology_Z=0.5*ones(md.mesh.numberofvertices,1);
 md=setflowequation(md,'macayeal','all');
@@ -14 +14 @@
 md.inversion.max_parameters=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=0.9*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.99*ones(md.inversion.nsteps,1);
 md.inversion.vx_obs=md.initialization.vx; 
@@ -23 +23 @@
 
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,DiagnosticSolutionEnum);
+md=solve(md,DiagnosticSolutionEnum());
 
 %Fields and tolerances to track changes
@@ -30 +30 @@
 field_values={...
    (md.results.DiagnosticSolution.Gradient1),...
-   md.results.DiagnosticSolution.J,...
+   (md.results.DiagnosticSolution.J),...
    (md.results.DiagnosticSolution.MaterialsRheologyZbar),...
    (md.results.DiagnosticSolution.Pressure),...

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

@@ -1 @@
-md=triangle(model,'../Exp/SquareHole.exp','../Exp/Rifts.exp',50000);
+md=triangle(model(),'../Exp/SquareHole.exp','../Exp/Rifts.exp',50000);
 md=meshprocessrifts(md,'../Exp/Square.exp');
 md=setmask(md,'all','');
@@ -5 +5 @@
 md.materials=matdamageice();
 md.materials.rheology_B=paterson(md.initialization.temperature);
-md.materials.rheology_n=3*ones(md.mesh.numberofelements,1);
+md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1);
 md.materials.rheology_Z=0.5*ones(md.mesh.numberofvertices,1);
 md=setflowequation(md,'macayeal','all');
 
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,DiagnosticSolutionEnum);
+md=solve(md,DiagnosticSolutionEnum());
 
 %Fields and tolerances to track changes