Changeset 22500

Timestamp:

03/06/18 14:45:23 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: sped up squaremesh (needed for BedMachine Ant.)

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test101.m (modified) (1 diff)
• test1101.m (modified) (2 diffs)
• test613.m (modified) (1 diff)

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

@@ -7 +7 @@
 
 %output
-md.stressbalance.requested_outputs={'default','DeviatoricStressxx','DeviatoricStressyy','DeviatoricStressxy','MassFlux1','MassFlux2','MassFlux3','MassFlux4','MassFlux5','MassFlux6'};
+md.stressbalance.requested_outputs={'default','DeviatoricStressxx','DeviatoricStressyy','DeviatoricStressxy','MassFlux1','MassFlux2','MassFlux3','MassFlux4','MassFlux5','MassFlux6','DeviatoricStresseffective'};
 md.outputdefinition.definitions={...
         massfluxatgate('name','MassFlux1','profilename',['../Exp/MassFlux1.exp'],'definitionstring','Outputdefinition1'),...

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

@@ -12 +12 @@
 for i=1:length(L_list),
         L=L_list{i};
-        nx=20; %numberof nodes in x direction
-        ny=20;
+        nx=10; %numberof nodes in x direction
+        ny=10;
         md=model();
         md=squaremesh(md,L,L,nx,ny);
         md=setmask(md,'',''); %ice sheet test
         md=parameterize(md,'../Par/ISMIPA.par');
-        md=extrude(md,9,1.);
+        md=extrude(md,4,1.);
 
-        md=setflowequation(md,'HO','all');
+        md=setflowequation(md,'FS','all');
+        md.flowequation.fe_FS='MINI';
 
         %Create dirichlet on the bed only
@@ -42 +43 @@
         %Compute the stressbalance
         md.cluster=generic('name',oshostname(),'np',8);
+        md.stressbalance.maxiter=1;
         md=solve(md,'Stressbalance');
+        error('S');
 
         %Plot the results and save them

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

@@ -15 +15 @@
 md.inversion.iscontrol=1;
 md.inversion.nsteps=2;
-md.inversion.control_parameters={'Vx','Vy'};
+%md.inversion.control_parameters={'Vx','Vy'};
+md.inversion.control_parameters={'BalancethicknessSpcthickness'};
 md.balancethickness.stabilization=1;
-md.inversion.gradient_scaling=[10./md.constants.yts*ones(md.inversion.nsteps,1) 10./md.constants.yts*ones(md.inversion.nsteps,1)];
-md.inversion.min_parameters=[-2000.*ones(md.mesh.numberofvertices,1) -2000.*ones(md.mesh.numberofvertices,1)];
-md.inversion.max_parameters=[+2000.*ones(md.mesh.numberofvertices,1) +2000.*ones(md.mesh.numberofvertices,1)];
+%md.inversion.gradient_scaling=[10./md.constants.yts*ones(md.inversion.nsteps,1) 10./md.constants.yts*ones(md.inversion.nsteps,1)];
+md.inversion.gradient_scaling=[100];
+%md.inversion.min_parameters=[-2000.*ones(md.mesh.numberofvertices,1) -2000.*ones(md.mesh.numberofvertices,1)];
+%md.inversion.max_parameters=[+2000.*ones(md.mesh.numberofvertices,1) +2000.*ones(md.mesh.numberofvertices,1)];
+md.inversion.min_parameters=[md.geometry.thickness-100];
+md.inversion.max_parameters=[md.geometry.thickness+100];
 md.inversion.cost_functions=201;
 md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1);
 md.inversion.maxiter_per_step=4*ones(md.inversion.nsteps,1);
 md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1);
+md.inversion = m1qn3inversion(md.inversion);
+
+md.inversion.surface_obs = ones(md.mesh.numberofvertices,1);
 
 md.verbose.control=1;