Changeset 26725

Timestamp:

12/09/21 08:41:54 (3 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moving files around

Location:

issm/trunk-jpl/src/jl

Files:

• core (moved) (moved from issm/trunk-jpl/src/jl/solve )
• core/solve.jl (modified) (1 diff)
• issm.jl (modified) (1 diff)
• tests (added)
• tests/test.jl (moved) (moved from issm/trunk-jpl/src/jl/test.jl ) (1 diff)
• tests/test101.jl (moved) (moved from issm/trunk-jpl/src/jl/test101.jl ) (2 diffs)
• tests/test201.jl (moved) (moved from issm/trunk-jpl/src/jl/test201.jl ) (4 diffs)
• tests/test301.jl (moved) (moved from issm/trunk-jpl/src/jl/test301.jl ) (3 diffs)
• tests/test501.jl (moved) (moved from issm/trunk-jpl/src/jl/test501.jl ) (2 diffs)
• usr (moved) (moved from issm/trunk-jpl/src/jl/md )

issm/trunk-jpl/src/jl/core/solve.jl

@@ -1 @@
-include("../md/classes.jl")
+include("../usr/classes.jl")
 include("./issmenums.jl")
 include("./toolkits.jl")

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

@@ -6 +6 @@
 module ISSM
 
-include("md/classes.jl")
+include("usr/classes.jl")
 export model
-include("md/exp.jl")
-include("md/utils.jl")
-export archread
-include("md/triangle.jl")
+include("usr/exp.jl")
+export expread, ContourToNodes
+include("usr/utils.jl")
+export archread, solve, issmdir
+include("usr/triangle.jl")
 export triangle
-include("md/parameterization.jl")
+include("usr/parameterization.jl")
 export setmask, InterpFromMeshToMesh2d
-include("solve/solve.jl")
-export solve
+include("core/solve.jl")
 
 end

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

@@ -1 +1 @@
 #!/Applications/Julia-1.6.app/Contents/Resources/julia/bin/julia
-include("issm.jl")
+include("../issm.jl")
 using .ISSM
 using MAT
 
 #Load model from MATLAB file
-#file = matopen("Pig.mat")
-file = matopen("/Users/mmorligh/Desktop/issmuci/trunk-jpl/examples/Pig2/Pig.mat")
+file = matopen("Pig.mat")
+#file = matopen("/Users/mmorligh/Desktop/issmuci/trunk-jpl/examples/Pig2/Pig.mat")
 mat = read(file, "md")
 close(file)

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

@@ -1 +1 @@
 #!/Applications/Julia-1.6.app/Contents/Resources/julia/bin/julia
-include("issm.jl")
+include("../issm.jl")
 using .ISSM
 
 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 = triangle(md,issmdir()*"/test/Exp/Square.exp",50000.)
 md = setmask(md,"all","")
 
@@ -22 +20 @@
 
 #Initial velocity
-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"))
+x     = archread(issmdir()*"/test/Data/SquareShelfConstrained.arch","x")
+y     = archread(issmdir()*"/test/Data/SquareShelfConstrained.arch","y")
+vx    = archread(issmdir()*"/test/Data/SquareShelfConstrained.arch","vx")
+vy    = archread(issmdir()*"/test/Data/SquareShelfConstrained.arch","vy")
+index = Int.(archread(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)

issm/trunk-jpl/src/jl/tests/test201.jl

@@ -1 +1 @@
 #!/Applications/Julia-1.6.app/Contents/Resources/julia/bin/julia
-include("issm.jl")
+include("../issm.jl")
 using .ISSM
 
-md = ISSM.model()
-md = ISSM.triangle(md,"../../test/Exp/Square.exp",50000.)
-md = ISSM.setmask(md,"all","")
+md = model()
+md = triangle(md,issmdir()*"/test/Exp/Square.exp",50000.)
+md = setmask(md,"all","")
 
 #Geometry
@@ -20 +20 @@
 
 #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 = ISSM.archread(ISSM.issmdir()*"/test/Data/SquareShelfConstrained.arch","index")
+x     = archread(issmdir()*"/test/Data/SquareShelfConstrained.arch","x")
+y     = archread(issmdir()*"/test/Data/SquareShelfConstrained.arch","y")
+vx    = archread(issmdir()*"/test/Data/SquareShelfConstrained.arch","vx")
+vy    = archread(issmdir()*"/test/Data/SquareShelfConstrained.arch","vy")
+index = archread(issmdir()*"/test/Data/SquareShelfConstrained.arch","index")
 md.initialization.vx=zeros(md.mesh.numberofvertices)#InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y)
 md.initialization.vy=zeros(md.mesh.numberofvertices)#InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y)
@@ -37 +37 @@
 
 #Boundary conditions
-nodefront=ISSM.ContourToNodes(md.mesh.x,md.mesh.y,"../../test/Exp/SquareFront.exp",2.0) .& md.mesh.vertexonboundary
+nodefront=ContourToNodes(md.mesh.x,md.mesh.y,issmdir()*"/test/Exp/SquareFront.exp",2.0) .& md.mesh.vertexonboundary
 md.stressbalance.spcvx = NaN*ones(md.mesh.numberofvertices)
 md.stressbalance.spcvy = NaN*ones(md.mesh.numberofvertices)
@@ -49 +49 @@
 md.stressbalance.spcvy[pos] .= 0.0
 
-md=ISSM.solve(md,"Stressbalance")
+md=solve(md,"Stressbalance")

issm/trunk-jpl/src/jl/tests/test301.jl

@@ -1 +1 @@
 #!/Applications/Julia-1.6.app/Contents/Resources/julia/bin/julia
-include("issm.jl")
+include("../issm.jl")
 using .ISSM
 
-md = ISSM.model()
-md = ISSM.triangle(md,"../../test/Exp/Square.exp",150000.)
-md = ISSM.setmask(md,"","")
+md = model()
+md = triangle(md,issmdir()*"/test/Exp/Square.exp",150000.)
+md = setmask(md,"","")
 
 #Geometry
@@ -20 +20 @@
 
 #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 = ISSM.archread(ISSM.issmdir()*"/test/Data/SquareShelfConstrained.arch","index")
+#x     = archread(issmdir()*"/test/Data/SquareShelfConstrained.arch","x")
+#y     = archread(issmdir()*"/test/Data/SquareShelfConstrained.arch","y")
+#vx    = archread(issmdir()*"/test/Data/SquareShelfConstrained.arch","vx")
+#vy    = archread(issmdir()*"/test/Data/SquareShelfConstrained.arch","vy")
+#index = archread(issmdir()*"/test/Data/SquareShelfConstrained.arch","index")
 md.initialization.vx=zeros(md.mesh.numberofvertices)#InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y)
 md.initialization.vy=zeros(md.mesh.numberofvertices)#InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y)
@@ -43 +43 @@
 md.stressbalance.spcvy[pos] .= 0.0
 
-md=ISSM.solve(md,"Stressbalance")
+md=solve(md,"Stressbalance")

issm/trunk-jpl/src/jl/tests/test501.jl

@@ -1 +1 @@
 #!/Applications/Julia-1.6.app/Contents/Resources/julia/bin/julia
-include("issm.jl")
+include("../issm.jl")
 using .ISSM
 
-md = ISSM.model()
-md = ISSM.triangle(md,"../../test/Exp/Pig.exp",10000.)
-md = ISSM.setmask(md,"../../test/Exp/PigShelves.exp","../../test/Exp/PigIslands.exp")
+md = model()
+md = triangle(md,issmdir()*"/test/Exp/Pig.exp",10000.)
+md = setmask( md,issmdir()*"/test/Exp/PigShelves.exp",issmdir()*"/test/Exp/PigIslands.exp")
 
 #Initial velocity and geometry
-x         = ISSM.archread(ISSM.issmdir()*"/test/Data/Pig.arch","x")
-y         = ISSM.archread(ISSM.issmdir()*"/test/Data/Pig.arch","y")
-vx_obs    = ISSM.archread(ISSM.issmdir()*"/test/Data/Pig.arch","vx_obs")
-vy_obs    = ISSM.archread(ISSM.issmdir()*"/test/Data/Pig.arch","vy_obs")
-index     = Int.(ISSM.archread(ISSM.issmdir()*"/test/Data/Pig.arch","index"))
-surface   = ISSM.archread(ISSM.issmdir()*"/test/Data/Pig.arch","surface")
-thickness = ISSM.archread(ISSM.issmdir()*"/test/Data/Pig.arch","thickness")
-bed       = ISSM.archread(ISSM.issmdir()*"/test/Data/Pig.arch","bed")
-md.initialization.vx=ISSM.InterpFromMeshToMesh2d(index, x, y, vx_obs, md.mesh.x, md.mesh.y, 0.0)
-md.initialization.vy=ISSM.InterpFromMeshToMesh2d(index, x, y, vy_obs, md.mesh.x, md.mesh.y, 0.0)
-md.geometry.surface = ISSM.InterpFromMeshToMesh2d(index, x, y, surface, md.mesh.x, md.mesh.y, 0.0)
-md.geometry.thickness = ISSM.InterpFromMeshToMesh2d(index, x, y, thickness, md.mesh.x, md.mesh.y, 0.0)
+x         = archread(issmdir()*"/test/Data/Pig.arch","x")
+y         = archread(issmdir()*"/test/Data/Pig.arch","y")
+vx_obs    = archread(issmdir()*"/test/Data/Pig.arch","vx_obs")
+vy_obs    = archread(issmdir()*"/test/Data/Pig.arch","vy_obs")
+index     = Int.(archread(issmdir()*"/test/Data/Pig.arch","index"))
+surface   = archread(issmdir()*"/test/Data/Pig.arch","surface")
+thickness = archread(issmdir()*"/test/Data/Pig.arch","thickness")
+bed       = archread(issmdir()*"/test/Data/Pig.arch","bed")
+md.initialization.vx=InterpFromMeshToMesh2d(index, x, y, vx_obs, md.mesh.x, md.mesh.y, 0.0)
+md.initialization.vy=InterpFromMeshToMesh2d(index, x, y, vy_obs, md.mesh.x, md.mesh.y, 0.0)
+md.geometry.surface = InterpFromMeshToMesh2d(index, x, y, surface, md.mesh.x, md.mesh.y, 0.0)
+md.geometry.thickness = InterpFromMeshToMesh2d(index, x, y, thickness, md.mesh.x, md.mesh.y, 0.0)
 md.geometry.base=md.geometry.surface .- md.geometry.thickness
 md.geometry.bed =md.geometry.base
 pos = findall(md.mask.ocean_levelset.<0)
-md.geometry.bed[pos] = ISSM.InterpFromMeshToMesh2d(index, x, y, bed, md.mesh.x[pos], md.mesh.y[pos])
+md.geometry.bed[pos] = InterpFromMeshToMesh2d(index, x, y, bed, md.mesh.x[pos], md.mesh.y[pos])
 
 md.materials.rheology_B=1.815730284801701e+08*ones(md.mesh.numberofvertices)
@@ -48 +48 @@
 md.stressbalance.spcvy[pos] .= 0.0
 
-md=ISSM.solve(md,"Stressbalance")
+md=solve(md,"Stressbalance")