add levelset, need to compare with ISSM matrix

DJ4Earth · Apr 8, 2024 · 0f7778d · 0f7778d
1 parent 4dbf2bf
commit 0f7778d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/core/analyses/levelsetanalysis.jl b/src/core/analyses/levelsetanalysis.jl
@@ -20,7 +20,7 @@ function CreateConstraints(analysis::LevelsetAnalysis,constraints::Vector{Constr
 end#}}}
 function CreateNodes(analysis::LevelsetAnalysis,nodes::Vector{Node},md::model) #{{{
 
-	numdof = 2
+	numdof = 1
 	for i in 1:md.mesh.numberofvertices
 		push!(nodes,Node(i,i,true,true,numdof,-ones(Int64,numdof), ones(Int64,numdof), -ones(Int64,numdof), zeros(numdof)))
 	end
@@ -87,6 +87,9 @@ function Core(analysis::LevelsetAnalysis,femmodel::FemModel)# {{{
 	println("   call computational core:");
 	solutionsequence_linear(femmodel,analysis)
 
+	# TODO: add reinitialization
+	# save
+   RequestedOutputsx(femmodel, [MaskIceLevelsetEnum])
 	return nothing
 end #}}}
 function CreateKMatrix(analysis::LevelsetAnalysis,element::Tria)# {{{

diff --git a/src/core/elements.jl b/src/core/elements.jl
@@ -247,7 +247,7 @@ function InputUpdateFromSolutionOneDof(element::Tria, ug::Vector{Float64},enum::
    for i in 1:numdof values[i]=ug[doflist[i]] end
 
    #Add back to Mask
-   AddInput(element, enum, value, P1Enum)
+   AddInput(element, enum, values, P1Enum)
 
    return nothing
 

diff --git a/test/test807.jl b/test/test807.jl
@@ -1,7 +1,7 @@
 using dJUICE
 
 md = model()
-md = triangle(md,issmdir()*"/test/Exp/Square.exp",50000.)
+md = triangle(md,issmdir()*"/test/Exp/Square.exp",200000.)
 md = setmask(md,"all","")
 
 #Geometry
@@ -52,7 +52,7 @@ md.basalforcings.groundedice_melting_rate=5*ones(md.mesh.numberofvertices)
 # mask
 Lx = xmax - xmin
 alpha = 2.0/3.0
-md.mask.ice_levelset = ((x .- alpha*Lx).>0) .- ((x .- alpha*Lx).<0)
+md.mask.ice_levelset = ((md.mesh.x .- alpha*Lx).>0) .- ((md.mesh.x .- alpha*Lx).<0)
 
 md.levelset.kill_icebergs = 0
 # time stepping