Changeset 26716

Timestamp:

12/08/21 06:09:27 (3 years ago)

Author:

Mathieu Morlighem

Message:

CHG: as usual

Location:

issm/trunk-jpl/src/jl

Files:

• md/classes.jl (modified) (1 diff)
• solve/analyses/stressbalanceanalysis.jl (modified) (3 diffs)
• test101.jl (modified) (1 diff)

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

@@ -141 +141 @@
 
         #Loop over all possible fields
-        for name1 in fieldnames(model)
-                if haskey(matmd, String(name1))
-                        mdfield  = getfield(md,name1)
-                        matfield = matmd[String(name1)]
-                        for name2 in fieldnames(typeof(mdfield))
-                                if haskey(matfield, String(name2))
-                                        println("recovering md.",name1,".",name2)
-                                        value_matlab = matfield[String(name2)]
-                                        value_julia  = getfield(mdfield, name2)
-
-                                        if typeof(value_matlab)==typeof(value_julia)
-                                                #setfield!(mdfield, name2, convert(typeof(getfield(mdfield, name2)), matfield[String(name2)]))
-                                                setfield!(mdfield, name2, value_matlab)
-
-                                        elseif typeof(value_matlab)==Float64 && typeof(value_julia)==Int64
-                                                setfield!(mdfield, name2, Int64(value_matlab))
-
-                                        elseif typeof(value_matlab)==Matrix{Float64} && typeof(value_julia)==Vector{Float64}
-                                                if(size(value_matlab,2)!=1) error("only one column expected") end
-                                                setfield!(mdfield, name2, value_matlab[:,1])
-
-                                        elseif typeof(value_matlab)==Matrix{Float64} && typeof(value_julia)==Matrix{Int64}
-                                                matrix = Matrix{Int64}(undef,size(value_matlab))
-                                                for i in 1:length(value_matlab) matrix[i] = Int64(value_matlab[i]) end
-                                                setfield!(mdfield, name2, matrix)
-
-                                        elseif typeof(value_matlab)==Matrix{Float64} && typeof(value_julia)==Vector{Bool}
-                                                if(size(value_matlab,2)!=1) error("only one column expected") end
-                                                vector = Vector{Bool}(undef,size(value_matlab,1))
-                                                for i in 1:length(vector) vector[i] = Bool(value_matlab[i]) end
-                                                setfield!(mdfield, name2, vector)
-
-                                        else
-                                                error("Don't know how to convert ",typeof(value_matlab)," to ",typeof(value_julia))
-                                        end
-                                end
+        for name1 in keys(matmd)
+                if !(Symbol(name1) in fieldnames(model))
+                        println("could not recover md.",name1)
+                        continue
+                end
+                mdfield  = getfield(md,Symbol(name1))
+                matfield = matmd[name1]
+                for name2 in keys(matfield)
+                        if !(Symbol(name2) in fieldnames(typeof(mdfield)))
+                                println("could not recover md.",name1,".",name2)
+                                continue
                         end
-                        #setfield!(md, name1, mdfield)
+                        value_matlab = matfield[name2]
+                        value_julia  = getfield(mdfield, Symbol(name2))
+
+                        if typeof(value_matlab)==typeof(value_julia)
+                                setfield!(mdfield, Symbol(name2), value_matlab)
+
+                        elseif typeof(value_matlab)==Float64 && typeof(value_julia)==Int64
+                                setfield!(mdfield, Symbol(name2), Int64(value_matlab))
+
+                        elseif typeof(value_matlab)==Matrix{Float64} && typeof(value_julia)==Vector{Float64}
+                                if(size(value_matlab,2)!=1) error("only one column expected") end
+                                setfield!(mdfield, Symbol(name2), value_matlab[:,1])
+
+                        elseif typeof(value_matlab)==Matrix{Float64} && typeof(value_julia)==Matrix{Int64}
+                                matrix = Matrix{Int64}(undef,size(value_matlab))
+                                for i in 1:length(value_matlab) matrix[i] = Int64(value_matlab[i]) end
+                                setfield!(mdfield, Symbol(name2), matrix)
+
+                        elseif typeof(value_matlab)==Matrix{Float64} && typeof(value_julia)==Vector{Bool}
+                                if(size(value_matlab,2)!=1) error("only one column expected") end
+                                vector = Vector{Bool}(undef,size(value_matlab,1))
+                                for i in 1:length(vector) vector[i] = Bool(value_matlab[i]) end
+                                setfield!(mdfield, Symbol(name2), vector)
+
+                        else
+                                error("Don't know how to convert ",typeof(value_matlab)," to ",typeof(value_julia))
+                        end
                 end
         end

issm/trunk-jpl/src/jl/solve/analyses/stressbalanceanalysis.jl

@@ -177 +177 @@
 
         if(IsIcefront(element))
-                A = zeros(6)
 
                 #Get additional parameters and inputs
@@ -187 +186 @@
                 GetIcefrontCoordinates!(element, xyz_list_front, xyz_list, MaskIceLevelsetEnum)
                 nx, ny = NormalSection(element, xyz_list_front)
-                #println("nx ",nx," ny:",ny)
 
                 gauss = GaussTria(element, xyz_list, xyz_list_front, 3)
@@ -202 +200 @@
 
                         for i in 1:numnodes
-                                #println("1: ",gauss.weights[ig]*Jdet*term*nx*basis[i]," 2: ",gauss.weights[ig]*Jdet*term*ny*basis[i])
                                 pe.values[2*i-1] += gauss.weights[ig]*Jdet*term*nx*basis[i]
                                 pe.values[2*i  ] += gauss.weights[ig]*Jdet*term*ny*basis[i]
-                                A[2*i-1] += gauss.weights[ig]*Jdet*term*nx*basis[i]
-                                A[2*i  ] += gauss.weights[ig]*Jdet*term*ny*basis[i]
                         end
                 end

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

@@ -27 +27 @@
 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,0.0)
-md.initialization.vy=ISSM.InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y,0.0)
+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)
 
 md.materials.rheology_B=1.815730284801701e+08*ones(md.mesh.numberofvertices)