Changeset 26500

Timestamp:

10/25/21 15:04:01 (3 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added more files

Location:

issm/trunk-jpl/src/jl

Files:

• issm.jl (modified) (5 diffs)
• issmenums.jl (added)
• parameterization.jl (added)
• solve.jl (added)
• test101.jl (added)
• triangle.jl (modified) (1 diff)

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

@@ -60 +60 @@
 function Initialization() #{{{
         return Initialization( Vector{Float64}(undef,0), Vector{Float64}(undef,0))
+end# }}}
+mutable struct Stressbalance
+        spcvx::Vector{Float64}
+        spcvy::Vector{Float64}
+        restol::Float64
+        reltol::Float64
+        abstol::Float64
+        maxiter::Int32
+end
+function Stressbalance() #{{{
+        return Stressbalance( Vector{Float64}(undef,0), Vector{Float64}(undef,0), 0., 0., 0., 0)
 end# }}}
 mutable struct Materials
@@ -89 +100 @@
         materials::Materials
         initialization::Initialization
+        stressbalance::Stressbalance
 end
 function model() #{{{
-        return model( Mesh2dTriangle(), Geometry(), Mask(), Materials(), Initialization())
+        return model( Mesh2dTriangle(), Geometry(), Mask(), Materials(), Initialization(),Stressbalance())
 end#}}}
 function Base.show(io::IO, md::model)# {{{
@@ -103 +115 @@
         @printf "%19s: %-22s -- %s\n" "materials" typeof(md.materials) "material properties"
         @printf "%19s: %-22s -- %s\n" "initialization" typeof(md.initialization) "initial state"
+        @printf "%19s: %-22s -- %s\n" "stressbalance" typeof(md.stressbalance) "stress balance parameters"
 
 end# }}}
@@ -143 +156 @@
                                 data .= ntoh.(data)
                                 data = reshape(data, (rows,cols))
+                                data = collect(data)
+                                if cols == 1
+                                        data = vec(data)
+                                end
                         else
                                 error("Error: Encountered invalid field type when reading data.")
@@ -156 +173 @@
         return output
 end# }}}
+function InterpFromMeshToMesh2d(index::Array,x::Vector,y::Vector,data::Vector,xout::Vector,yout::Vector) #{{{
+        #prepare input arrays
+        nods = Cint(length(x))
+        nels = Cint(size(index,1))
+        nods_interp = Cint(length(xout))
+        Cindex=Array{Cint,1}(undef,length(index))
+        for i in 1:size(index,1)
+                for j in 1:3
+                        Cindex[(i-1)*3+j] = Int32(index[i,j])
+                end
+        end
+        Cx    = Array{Cdouble,1}(undef,nods)
+        Cy    = Array{Cdouble,1}(undef,nods)
+        Cdata = Array{Cdouble,1}(undef,nods)
+        for i in 1:nods
+                Cx[i]    = x[i]
+                Cy[i]    = y[i]
+                Cdata[i] = data[i]
+        end
+        Cxout = Array{Cdouble,1}(undef,nods_interp)
+        Cyout = Array{Cdouble,1}(undef,nods_interp)
+        for i in 1:nods_interp
+                Cxout[i] = xout[i]
+                Cyout[i] = yout[i]
+        end
+
+        Cdataout = Vector{Float64}(undef,nods_interp)
+
+        #This is not working....
+        rc=ccall( (:InterpFromMeshToMesh2dx,"libISSMCore"),
+                                Cint, (Ptr{Ptr{Cdouble}},Ptr{Cint}, Ptr{Cdouble}, Ptr{Cdouble}, Cint, Cint, Ptr{Cdouble}, Cint, Cint, Ptr{Cdouble}, Ptr{Cdouble}, Cint),
+                                Ref(Ref(Cdataout)), Ref(Cindex), Ref(Cx), Ref(Cy), nods, nels,
+                                Ref(Cdata), nods, 1, Ref(Cxout), Ref(Cyout), nods_interp)
+
+        #Process output
+        dataout = Vector{Float64}(undef,nods_interp)
+        for i in 1:nods_interp
+                dataout[i] = Cdataout[i]
+        end
+
+        return dataout
+end #}}}
+function solve(md::model,solution::String) #{{{
+
+        if solution=="sb" || solution=="Stressbalance"
+                solutionstring = "StressbalanceSolution"
+        else
+                error("solutionstring "*solution*" not supported!");
+        end
+
+        IssmCore(md)
+
+        return md
+end #}}}

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

@@ -154 +154 @@
         #Call triangle using ISSM's default options
         triangle_switches = "pQzDq30ia"*@sprintf("%lf",area) #replace V by Q to quiet down the logging
-        #rc=ccall( (:triangulate,"../../externalpackages/triangle/src/libtriangle.dylib"),
-        rc=ccall( (:triangulate,"libtriangle"),
+        #rc=ccall( (:triangulate,"libtriangle"),
+        rc=ccall( (:triangulate,"../../externalpackages/triangle/src/libtriangle.dylib"),
                                 Cint, ( Cstring, Ref{CTriangulateIO}, Ref{CTriangulateIO}, Ref{CTriangulateIO}),
                                 triangle_switches, Ref(ctio_in), Ref(ctio_out), Ref(vor_out))
-        println("number of elements: ",ctio_out.numberoftriangles)
 
         #post process output