Changeset 21604

Timestamp:

03/10/17 20:40:07 (8 years ago)

Author:

seroussi

Message:

NEW: changed NR test408 to coulomb friction law

Location:

issm/trunk-jpl/test

Files:

• Archives/Archive408.arch (modified) ( previous)
• NightlyRun/test408.m (modified) (1 diff)
• NightlyRun/test408.py (modified) (1 diff)

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

@@ -3 +3 @@
 md=setmask(md,'../Exp/SquareShelf.exp','');
 md=parameterize(md,'../Par/SquareSheetShelf.par');
+md.geometry.bed=md.geometry.base;
+pos=find(md.mask.groundedice_levelset<0);
+md.geometry.bed(pos)=md.geometry.base(pos)-10;
+md.friction=frictioncoulomb();
+md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1);
+md.friction.p=ones(md.mesh.numberofelements,1);
+md.friction.q=ones(md.mesh.numberofelements,1);
+md.friction.coefficientcoulomb=0.02*ones(md.mesh.numberofvertices,1);
 md=extrude(md,3,1);
 md.transient.isthermal=0;
+md.transient.isgroundingline=1;
 md=setflowequation(md,'SSA','all');
 md.cluster=generic('name',oshostname(),'np',3);

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

@@ -9 +9 @@
 from setflowequation import *
 from solve import *
+from frictioncoulomb import frictioncoulomb
 
 md=triangle(model(),'../Exp/Square.exp',150000.)
 md=setmask(md,'../Exp/SquareShelf.exp','')
 md=parameterize(md,'../Par/SquareSheetShelf.py')
+md.geometry.bed=md.geometry.base
+pos=numpy.nonzero(md.mask.groundedice_levelset<0.)
+md.geometry.bed[pos]=md.geometry.base[pos]-10
+md.friction=frictioncoulomb()
+md.friction.coefficient=20*np.ones(md.mesh.numberofvertices)
+md.friction.p=1*np.ones(md.mesh.numberofvertices)
+md.friction.q=1*np.ones(md.mesh.numberofvertices)
+md.friction.coefficientcoulomb=0.02*np.ones(md.mesh.numberofvertices)
+md.transient.isthermal=False
+md.transient.isgroundingline=True
 md.extrude(3,1.)
 md=setflowequation(md,'SSA','all')
-md.transient.isthermal=False
 md.cluster=generic('name',gethostname(),'np',3)
 md.transient.requested_outputs=['default','GroundedArea','FloatingArea','TotalFloatingBmb','TotalGroundedBmb','TotalSmb']