Merge pull request #20 from DJ4Earth/add_ISSM_test_Archive

add Archives from ISSM. Compare DJUICE solutions directly with ISSM solutions

test/runtests.jl

@@ -5,7 +5,10 @@ function searchdir(path,key)
 	filter(x->occursin(key,x), readdir(path))
 end
 
-function compareArchive(id, procedure::Symbol)
+function compareArchive(tf::String, procedure::Symbol)
+	# run test
+	@inline include(tf)
+	id = match(r"test(\d+).jl", tf).captures[1]
 	archive_name = "Archive"*string(id)
 	archive_path = issmdir()*"/test/Archives/"*archive_name*".arch"
 	if procedure===:update
@@ -20,31 +23,30 @@ function compareArchive(id, procedure::Symbol)
 				tolerance=field_tolerances[k];
 
 				# Compare to archive
-				# Our output is in the correct order (n,1) or (1,1), so we do not need to transpose again
-				archive = archread(archive_path, archive_name*"_field"*string(k))
-				error_diff = (maximum(abs.(archive-field))/(maximum(abs.(archive))+eps(Float64)))
+				if !isnan(tolerance)
+					# Our output is in the correct order (n,1) or (1,1), so we do not need to transpose again
+					archive = archread(archive_path, archive_name*"_field"*string(k))
+					error_diff = (maximum(abs.(archive-field))/(maximum(abs.(archive))+eps(Float64)))
 
-				@test isnan(error_diff) == false
-				@test error_diff < tolerance
+					@test isnan(error_diff) == false
+					@test error_diff < tolerance skip = isnan(tolerance)
+				end
 			end
 		else
 			@warn "$archive_name does not exist! Skip the comparison of the results"
 		end
 	end
 end
 
-@time begin
+@time @testset "DJUICE" begin
 	@time @testset "Model Struct Tests" begin include("modelstructtests.jl") end
 
 	# test each individual cases, name with test[0-9]*.jl
 	testsolutions = searchdir("./", r"test\d+.jl")
-	@time @testset "Model Solution Tests" begin
-		for tf in testsolutions
-			# run the test
-			include(tf)
+	for tf in testsolutions
+		@time @testset "Model Solution Tests: $tf"  begin
 			# check the results vs. saved archive
-			testid = match(r"test(\d+).jl", tf).captures[1]
-			compareArchive(testid, :test)
+			compareArchive(tf, :test)
 		end
 	end
 

test/test201.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", 150000.)
 md = setmask(md, "all", "")
 
 #Geometry
@@ -14,20 +14,20 @@ xmax=maximum(md.mesh.x)
 md.geometry.thickness = hmax .+ (hmin-hmax)*(md.mesh.y .- ymin)./(ymax-ymin) .+ 0.1*(hmin-hmax)*(md.mesh.x .- xmin)./(xmax-xmin)
 md.geometry.base      = -md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
 md.geometry.surface   = md.geometry.base+md.geometry.thickness
-md.geometry.bed       = md.geometry.base .-10
+md.geometry.bed       = md.geometry.base .-500
 
 #Initial velocity
-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)
+x     = archread(issmdir()*"/test/Data/SquareShelf.arch","x")
+y     = archread(issmdir()*"/test/Data/SquareShelf.arch","y")
+vx    = archread(issmdir()*"/test/Data/SquareShelf.arch","vx")
+vy    = archread(issmdir()*"/test/Data/SquareShelf.arch","vy")
+index = round.(Int64, archread(issmdir()*"/test/Data/SquareShelf.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)
 md.materials.rheology_n=3*ones(md.mesh.numberofelements)
-md.friction.coefficient=20*ones(md.mesh.numberofvertices)
+md.friction.coefficient=0*ones(md.mesh.numberofvertices)
 md.friction.p=ones(md.mesh.numberofvertices)
 md.friction.q=ones(md.mesh.numberofvertices)
 
@@ -49,3 +49,9 @@ md.stressbalance.spcvx[pos] .= 0.0
 md.stressbalance.spcvy[pos] .= 0.0
 
 md=solve(md,:Stressbalance)
+# Fields and tolerances to track changes
+field_names =["Vx","Vy","Vel"]
+field_tolerances=[2e-10,2e-10,2e-10]
+field_values= [(md.results["StressbalanceSolution"]["Vx"]),
+               (md.results["StressbalanceSolution"]["Vy"]),
+               (md.results["StressbalanceSolution"]["Vel"]) ]

test/test208.jl

@@ -14,20 +14,21 @@ xmax=maximum(md.mesh.x)
 md.geometry.thickness = hmax .+ (hmin-hmax)*(md.mesh.y .- ymin)./(ymax-ymin) .+ 0.1*(hmin-hmax)*(md.mesh.x .- xmin)./(xmax-xmin)
 md.geometry.base      = -md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
 md.geometry.surface   = md.geometry.base+md.geometry.thickness
-md.geometry.bed       = md.geometry.base .-10
+md.geometry.bed       = md.geometry.base .- 500
 
 #Initial velocity
-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)
+x     = archread(issmdir()*"/test/Data/SquareShelf.arch","x")
+y     = archread(issmdir()*"/test/Data/SquareShelf.arch","y")
+vx    = archread(issmdir()*"/test/Data/SquareShelf.arch","vx")
+vy    = archread(issmdir()*"/test/Data/SquareShelf.arch","vy")
+index = round.(Int64, archread(issmdir()*"/test/Data/SquareShelf.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)
 md.materials.rheology_n=3*ones(md.mesh.numberofelements)
 md.friction.coefficient=20*ones(md.mesh.numberofvertices)
+md.friction.coefficient[md.mask.ocean_levelset.<0.] .= 0.0
 md.friction.p=ones(md.mesh.numberofvertices)
 md.friction.q=ones(md.mesh.numberofvertices)
 
@@ -57,3 +58,17 @@ md.basalforcings.floatingice_melting_rate = ones(md.mesh.numberofvertices)
 md.masstransport.spcthickness = NaN*ones(md.mesh.numberofvertices)
 
 md=solve(md,:Transient)
+
+# Fields and tolerances to track changes
+field_names =["Vx1","Vy1","Vel1","Presure1", "Bed1","Surface1","Thickness1", "TotalGroundedBmb1", "TotalFloatingBmb1"]
+field_tolerances=[2e-10,2e-10,2e-10,NaN,2e-10,2e-10,2e-10,NaN,NaN]
+field_values= [(md.results["TransientSolution"][1]["Vx"]),
+					(md.results["TransientSolution"][1]["Vy"]),
+					(md.results["TransientSolution"][1]["Vel"]),
+					(NaN),
+					(md.results["TransientSolution"][1]["Base"]),
+					(md.results["TransientSolution"][1]["Surface"]),
+					(md.results["TransientSolution"][1]["Thickness"]),
+					(NaN),
+					(NaN),
+					]

test/test301.jl

@@ -43,3 +43,9 @@ md.stressbalance.spcvx[pos] .= 0.0
 md.stressbalance.spcvy[pos] .= 0.0
 
 md=solve(md,:Stressbalance)
+
+field_names =["Vx","Vy","Vel"]
+field_tolerances=[NaN,NaN,NaN]
+field_values= [(md.results["StressbalanceSolution"]["Vx"]),
+					(md.results["StressbalanceSolution"]["Vy"]),
+					(md.results["StressbalanceSolution"]["Vel"]) ]

test/test501.jl

@@ -1,7 +1,7 @@
 using DJUICE
 
 md = model()
-md = triangle(md,issmdir()*"/test/Exp/Pig.exp",10000.)
+md = triangle(md,issmdir()*"/test/Exp/Pig.exp",20000.)
 md = setmask( md,issmdir()*"/test/Exp/PigShelves.exp",issmdir()*"/test/Exp/PigIslands.exp")
 
 #Initial velocity and geometry
@@ -48,3 +48,9 @@ md.stressbalance.spcvx[pos] .= 0.0
 md.stressbalance.spcvy[pos] .= 0.0
 
 md=solve(md, :Stressbalance)
+
+field_names =["Vx","Vy","Vel"]
+field_tolerances=[NaN,NaN,NaN]
+field_values= [(md.results["StressbalanceSolution"]["Vx"]),
+               (md.results["StressbalanceSolution"]["Vy"]),
+               (md.results["StressbalanceSolution"]["Vel"]) ]

test/test807.jl

@@ -63,7 +63,7 @@ md.timestepping.final_time = 30;
 md.transient.isstressbalance=1;
 md.transient.ismasstransport=1;
 md.transient.issmb=1;
-md.transient.ismovingfront=1;
+md.transient.ismovingfront=0;
 
 md.calving.calvingrate=0*ones(md.mesh.numberofvertices)
 md.frontalforcings.meltingrate=10000*ones(md.mesh.numberofvertices)