fix

zjwegert · Dec 11, 2024 · 2be7919 · 2be7919
1 parent 01703a5
commit 2be7919
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/scripts/Embedded/Examples/fsi/gmsh/GMSH_TO-6-Brinkmann_stokes_P2-P1_Ersatz_elast_fsi.jl b/scripts/Embedded/Examples/fsi/gmsh/GMSH_TO-6-Brinkmann_stokes_P2-P1_Ersatz_elast_fsi.jl
@@ -118,7 +118,7 @@ b_Ω(v,p) = - (∇⋅v)*p
 
 a_fluid((u,p),(v,q)) =
   ∫( a_Ω(u,v)+b_Ω(u,q)+b_Ω(v,p)) * Ω.dΩf +
-  ∫( a_Ω(u,v)+b_Ω(u,q)+b_Ω(v,p) + (γ(hmin))*u⋅v ) * Ω.dΩs
+  ∫( a_Ω(u,v)+b_Ω(u,q)+b_Ω(v,p) + (γ ∘ hₕ)*u⋅v ) * Ω.dΩs
 
 ## Structure
 # Stabilization and material parameters
@@ -165,7 +165,7 @@ ls_evo = UnfittedFEEvolution(evo,reinit)
 
 ## Hilbertian extension-regularisation problems
 _α(hₕ) = (α_coeff*hₕ)^2
-a_hilb(p,q) =∫((_α(hmin))*∇(p)⋅∇(q) + p*q)dΩ_act;
+a_hilb(p,q) =∫((_α ∘ hₕ)*∇(p)⋅∇(q) + p*q)dΩ_act;
 vel_ext = VelocityExtension(a_hilb,U_reg,V_reg)
 
 ## Optimiser

diff --git a/src/GridapTopOpt.jl b/src/GridapTopOpt.jl
@@ -32,7 +32,8 @@ using PartitionedArrays: getany, tuple_of_arrays, matching_ghost_indices
 
 using GridapSolvers
 using GridapSolvers.LinearSolvers, GridapSolvers.NonlinearSolvers, GridapSolvers.BlockSolvers
-using GridapSolvers.SolverInterfaces: SolverVerboseLevel, SOLVER_VERBOSE_NONE, SOLVER_VERBOSE_LOW, SOLVER_VERBOSE_HIGH
+using GridapSolvers.SolverInterfaces: SolverVerboseLevel, SOLVER_VERBOSE_NONE, SOLVER_VERBOSE_LOW, SOLVER_VERBOSE_HIGH,
+  SOLVER_CONVERGED_ATOL, SOLVER_CONVERGED_RTOL, ConvergenceLog, finished_flag
 
 using GridapEmbedded
 using GridapEmbedded.LevelSetCutters, GridapEmbedded.Interfaces

diff --git a/src/LevelSetEvolution/UnfittedEvolution/StabilisedReinit.jl b/src/LevelSetEvolution/UnfittedEvolution/StabilisedReinit.jl
@@ -77,16 +77,14 @@ function solve!(s::StabilisedReinit,φh,cache::Nothing)
   # Operator and cache
   op = get_algebraic_operator(FEOperator(res,jac,V_φ,V_φ,assembler))
   nls_cache = instantiate_caches(get_free_dof_values(φh),nls,op)
-  s.cache = (;nls_cache,φh_tmp)
+  s.cache = (;nls_cache,φ_tmp)
   # Solve
   solve!(get_free_dof_values(φh),nls,op,nls_cache)
   copy!(φ_tmp,get_free_dof_values(φ))
   update_collection!(s.Ωs,φh) # TODO: remove?
   return φh
 end
 
-using GridapSolvers.SolverInterfaces: SOLVER_CONVERGED_ATOL,SOLVER_CONVERGED_RTOL,ConvergenceLog,finished_flag
-
 function solve!(s::StabilisedReinit,φh,cache)
   nls, V_φ, assembler, = s.nls, s.space, s.assembler
   nls_cache, φ_tmp = cache