update test for basalmelting

Author: enigne

examples/ModelBig.mat

@@ -1,23 +1,29 @@
 using DJUICE
 using MAT
-using GLMakie
+using JLD2
+#using GLMakie
 
 #Load model from MATLAB file
 file = matopen(joinpath(@__DIR__, ".", "","ModelBig.mat"))
 
 mat  = read(file, "md")
 close(file)
-md = model(mat, friction=DJUICE.SchoofFriction())
+md = model(mat, friction=DJUICE.BuddFriction(), basalforcings=DJUICE.LinearBasalforcings())
 
 md.timestepping.time_step = 0.1
+md.timestepping.start_time = 1995
+md.timestepping.final_time = 1995.5
 #make model run faster 
 #md.stressbalance.maxiter = 100
 #
 ##Now call AD!
 md.inversion.iscontrol = 1
 #md.friction.coefficient = 30*ones(size(md.friction.coefficient))
-md.inversion.independent = md.friction.C
-md.inversion.independent_string = "FrictionC"
+#md.inversion.independent = md.friction.C
+#md.inversion.independent_string = "FrictionC"
+
+md.inversion.independent = md.basalforcings.perturbation_melting_rate
+md.inversion.independent_string = "BasalforcingsPerturbationMeltingRate"
 md.inversion.dependent_string = ["IceVolumeAboveFloatation"]
 md.inversion.vx_obs = md.initialization.vx
 md.inversion.vy_obs = md.initialization.vy
@@ -26,6 +32,9 @@ md.inversion.vy_obs = md.initialization.vy
 #md = solve(md, :sb)
 md = solve(md, :Transient)
 
+# save
+#@save "test_bm.jld2" md
+
 # the gradient
 #g = md.results["StressbalanceSolution"]["Gradient"]
 

examples/test_bm.jl

@@ -357,10 +357,10 @@ function model(md::model; mesh::AbstractMesh=md.mesh, friction::AbstractFriction
 					 md.masstransport, md.transient, md.inversion, md.calving, 
 					 md.levelset, md.frontalforcings)
 end#}}}
-function model(matmd::Dict; verbose::Bool=true, friction::AbstractFriction=BuddFriction()) #{{{
+function model(matmd::Dict; verbose::Bool=true, friction::AbstractFriction=BuddFriction(), basalforcings::AbstractBasalforcings=DefaultBasalforcings()) #{{{
 
 	#initialize output
-	md = model(model(), friction=friction)
+	md = model(model(), friction=friction, basalforcings=basalforcings)
 
 	#Loop over all possible fields
 	for name1 in keys(matmd)