Changeset 26724

Timestamp:

12/09/21 08:25:48 (3 years ago)

Author:

Mathieu Morlighem

Message:

CHG: exporting some functions to avoid ISSM.

Location:

issm/trunk-jpl/src/jl

Files:

• test.jl (modified) (1 diff)
• test101.jl (modified) (3 diffs)

issm/trunk-jpl/src/jl/test.jl

@@ -9 +9 @@
 mat = read(file, "md")
 close(file)
-md=ISSM.model(mat)
+md=model(mat)
 
 #Solve stress balance

issm/trunk-jpl/src/jl/test101.jl

@@ -3 +3 @@
 using .ISSM
 
-md = ISSM.model()
-md = ISSM.triangle(md,"../../test/Exp/Square.exp",50000.)
+md = model()
+md = triangle(md,"../../test/Exp/Square.exp",50000.)
 #md = ISSM.triangle(md,"../../test/Exp/Square.exp",250000.)
 #md = ISSM.triangle(md,"../../test/Exp/Square.exp",1000.)
-md = ISSM.setmask(md,"all","")
+md = setmask(md,"all","")
 
 #Geometry
@@ -22 +22 @@
 
 #Initial velocity
-x     = ISSM.archread(ISSM.issmdir()*"/test/Data/SquareShelfConstrained.arch","x")
-y     = ISSM.archread(ISSM.issmdir()*"/test/Data/SquareShelfConstrained.arch","y")
-vx    = ISSM.archread(ISSM.issmdir()*"/test/Data/SquareShelfConstrained.arch","vx")
-vy    = ISSM.archread(ISSM.issmdir()*"/test/Data/SquareShelfConstrained.arch","vy")
-index = Int.(ISSM.archread(ISSM.issmdir()*"/test/Data/SquareShelfConstrained.arch","index"))
-md.initialization.vx=ISSM.InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y,NaN)
-md.initialization.vy=ISSM.InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y,NaN)
+x     = archread(ISSM.issmdir()*"/test/Data/SquareShelfConstrained.arch","x")
+y     = archread(ISSM.issmdir()*"/test/Data/SquareShelfConstrained.arch","y")
+vx    = archread(ISSM.issmdir()*"/test/Data/SquareShelfConstrained.arch","vx")
+vy    = archread(ISSM.issmdir()*"/test/Data/SquareShelfConstrained.arch","vy")
+index = Int.(archread(ISSM.issmdir()*"/test/Data/SquareShelfConstrained.arch","index"))
+md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y,0.0)
+md.initialization.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y,0.0)
 
 md.materials.rheology_B=1.815730284801701e+08*ones(md.mesh.numberofvertices)
@@ -45 +45 @@
 md.stressbalance.spcvy[pos] .= 0.0
 
-md=ISSM.solve(md,"Stressbalance")
+md=solve(md,"Stressbalance")