StateParamIntegrandWithMeasure -> StateParamMap

zjwegert · Dec 17, 2024 · fc811cd · fc811cd
1 parent efc9d68
commit fc811cd
Show file tree

Hide file tree

Showing 19 changed files with 80 additions and 77 deletions.
diff --git a/docs/src/reference/chainrules.md b/docs/src/reference/chainrules.md
@@ -10,11 +10,11 @@ GridapTopOpt.evaluate_derivatives!
 GridapTopOpt.get_state
 ```
 
-## `StateParamIntegrandWithMeasure`
+## `StateParamMap`
 
 ```@docs
-GridapTopOpt.StateParamIntegrandWithMeasure
-GridapTopOpt.rrule(u_to_j::GridapTopOpt.StateParamIntegrandWithMeasure,uh,φh)
+GridapTopOpt.StateParamMap
+GridapTopOpt.rrule(u_to_j::GridapTopOpt.StateParamMap,uh,φh)
 ```
 
 ## Implemented types of `AbstractFEStateMap`

diff --git a/scripts/Embedded/Examples/2d_compliance_L.jl b/scripts/Embedded/Examples/2d_compliance_L.jl
@@ -2,7 +2,7 @@ using Gridap,GridapTopOpt, GridapSolvers
 using Gridap.Adaptivity, Gridap.Geometry
 using GridapEmbedded, GridapEmbedded.LevelSetCutters
 
-using GridapTopOpt: StateParamIntegrandWithMeasure
+using GridapTopOpt: StateParamMap
 
 path="./results/UnfittedFEM_elastic_compliance_LShape_ALM/"
 rm(path,force=true,recursive=true)
@@ -108,8 +108,8 @@ state_collection = EmbeddedCollection(model,φh) do _,_
   state_map = AffineFEStateMap(a,l,U,V,V_φ,U_reg,φh;ls,adjoint_ls=ls)
   (;
     :state_map => state_map,
-    :J => StateParamIntegrandWithMeasure(J,state_map),
-    :C => map(Ci -> StateParamIntegrandWithMeasure(Ci,state_map),[Vol,])
+    :J => StateParamMap(J,state_map),
+    :C => map(Ci -> StateParamMap(Ci,state_map),[Vol,])
   )
 end
 pcfs = EmbeddedPDEConstrainedFunctionals(state_collection;analytic_dC=(dVol,))

diff --git a/scripts/Embedded/Examples/2d_fluid_structure_(stokes).jl b/scripts/Embedded/Examples/2d_fluid_structure_(stokes).jl
@@ -2,7 +2,7 @@ using Gridap,GridapTopOpt, GridapSolvers
 using Gridap.Adaptivity, Gridap.Geometry
 using GridapEmbedded, GridapEmbedded.LevelSetCutters
 
-using GridapTopOpt: StateParamIntegrandWithMeasure
+using GridapTopOpt: StateParamMap
 
 path = "./results/UnfittedFEM_fluid_structure_(stokes)_ALM/"
 rm(path,force=true,recursive=true)

diff --git a/scripts/Embedded/Examples/2d_thermal.jl b/scripts/Embedded/Examples/2d_thermal.jl
@@ -2,7 +2,7 @@ using Gridap,GridapTopOpt, GridapSolvers
 using Gridap.Adaptivity, Gridap.Geometry
 using GridapEmbedded, GridapEmbedded.LevelSetCutters
 
-using GridapTopOpt: StateParamIntegrandWithMeasure
+using GridapTopOpt: StateParamMap
 
 path="./results/UnfittedFEM_thermal_compliance_ALM/"
 rm(path,force=true,recursive=true)
@@ -79,8 +79,8 @@ state_collection = EmbeddedCollection(model,φh) do _,_
   state_map = AffineFEStateMap(a,l,U,V,V_φ,U_reg,φh;ls,adjoint_ls=ls)
   (;
     :state_map => state_map,
-    :J => StateParamIntegrandWithMeasure(J,state_map),
-    :C => map(Ci -> StateParamIntegrandWithMeasure(Ci,state_map),[Vol,])
+    :J => StateParamMap(J,state_map),
+    :C => map(Ci -> StateParamMap(Ci,state_map),[Vol,])
   )
 end
 pcfs = EmbeddedPDEConstrainedFunctionals(state_collection;analytic_dC=(dVol,))

diff --git a/scripts/Embedded/Examples/2d_thermal_AgFEM.jl b/scripts/Embedded/Examples/2d_thermal_AgFEM.jl
@@ -2,7 +2,7 @@ using Gridap,GridapTopOpt, GridapSolvers
 using Gridap.Adaptivity, Gridap.Geometry
 using GridapEmbedded, GridapEmbedded.LevelSetCutters
 
-using GridapTopOpt: StateParamIntegrandWithMeasure
+using GridapTopOpt: StateParamMap
 
 path="./results/AgFEM_thermal_compliance_ALM/"
 rm(path,force=true,recursive=true)
@@ -82,8 +82,8 @@ state_collection = EmbeddedCollection(model,φh) do cutgeo,_
   state_map = AffineFEStateMap(a,l,U,V,V_φ,U_reg,φh;ls,adjoint_ls=ls)
   (;
     :state_map => state_map,
-    :J => StateParamIntegrandWithMeasure(J,state_map),
-    :C => map(Ci -> StateParamIntegrandWithMeasure(Ci,state_map),[Vol,])
+    :J => StateParamMap(J,state_map),
+    :C => map(Ci -> StateParamMap(Ci,state_map),[Vol,])
   )
 end
 pcfs = EmbeddedPDEConstrainedFunctionals(state_collection;analytic_dC=(dVol,))

diff --git a/scripts/Embedded/Examples/2d_thermal_L.jl b/scripts/Embedded/Examples/2d_thermal_L.jl
@@ -2,7 +2,7 @@ using Gridap,GridapTopOpt, GridapSolvers
 using Gridap.Adaptivity, Gridap.Geometry
 using GridapEmbedded, GridapEmbedded.LevelSetCutters
 
-using GridapTopOpt: StateParamIntegrandWithMeasure
+using GridapTopOpt: StateParamMap
 
 path="./results/UnfittedFEM_thermal_compliance_LShape_ALM/"
 rm(path,force=true,recursive=true)
@@ -87,8 +87,8 @@ state_collection = EmbeddedCollection(model,φh) do _,_
   state_map = AffineFEStateMap(a,l,U,V,V_φ,U_reg,φh;ls,adjoint_ls=ls)
   (;
     :state_map => state_map,
-    :J => StateParamIntegrandWithMeasure(J,state_map),
-    :C => map(Ci -> StateParamIntegrandWithMeasure(Ci,state_map),[Vol,])
+    :J => StateParamMap(J,state_map),
+    :C => map(Ci -> StateParamMap(Ci,state_map),[Vol,])
   )
 end
 pcfs = EmbeddedPDEConstrainedFunctionals(state_collection;analytic_dC=(dVol,))

diff --git a/scripts/Embedded/Examples/2d_thermal_gmsh_example.jl b/scripts/Embedded/Examples/2d_thermal_gmsh_example.jl
@@ -2,7 +2,7 @@ using Gridap,GridapTopOpt, GridapSolvers
 using Gridap.Adaptivity, Gridap.Geometry
 using GridapEmbedded, GridapEmbedded.LevelSetCutters
 
-using GridapTopOpt: StateParamIntegrandWithMeasure
+using GridapTopOpt: StateParamMap
 
 path="./results/UnfittedFEM_thermal_compliance_gmsh_ALM/"
 rm(path,force=true,recursive=true)
@@ -87,8 +87,8 @@ state_collection = EmbeddedCollection(model,φh) do _,_
   state_map = AffineFEStateMap(a,l,U,V,V_φ,U_reg,φh;ls,adjoint_ls=ls)
   (;
     :state_map => state_map,
-    :J => StateParamIntegrandWithMeasure(J,state_map),
-    :C => map(Ci -> StateParamIntegrandWithMeasure(Ci,state_map),[Vol,])
+    :J => StateParamMap(J,state_map),
+    :C => map(Ci -> StateParamMap(Ci,state_map),[Vol,])
   )
 end
 pcfs = EmbeddedPDEConstrainedFunctionals(state_collection;analytic_dC=(dVol,))

diff --git a/scripts/Embedded/Examples/2d_thermal_weird_background.jl b/scripts/Embedded/Examples/2d_thermal_weird_background.jl
@@ -2,7 +2,7 @@ using Gridap,GridapTopOpt, GridapSolvers
 using Gridap.Adaptivity, Gridap.Geometry
 using GridapEmbedded, GridapEmbedded.LevelSetCutters
 
-using GridapTopOpt: StateParamIntegrandWithMeasure
+using GridapTopOpt: StateParamMap
 
 path="./results/UnfittedFEM_thermal_compliance_weirdBG_ALM/"
 rm(path,force=true,recursive=true)
@@ -87,8 +87,8 @@ state_collection = EmbeddedCollection(model,φh) do _,_
   state_map = AffineFEStateMap(a,l,U,V,V_φ,U_reg,φh;ls,adjoint_ls=ls)
   (;
     :state_map => state_map,
-    :J => StateParamIntegrandWithMeasure(J,state_map),
-    :C => map(Ci -> StateParamIntegrandWithMeasure(Ci,state_map),[Vol,])
+    :J => StateParamMap(J,state_map),
+    :C => map(Ci -> StateParamMap(Ci,state_map),[Vol,])
   )
 end
 pcfs = EmbeddedPDEConstrainedFunctionals(state_collection;analytic_dC=(dVol,))

diff --git a/scripts/Embedded/Examples/CutFEM_2d_thermal_(island_checking).jl b/scripts/Embedded/Examples/CutFEM_2d_thermal_(island_checking).jl
@@ -2,7 +2,7 @@ using Gridap,GridapTopOpt, GridapSolvers
 using Gridap.Adaptivity, Gridap.Geometry
 using GridapEmbedded, GridapEmbedded.LevelSetCutters
 
-using GridapTopOpt: StateParamIntegrandWithMeasure
+using GridapTopOpt: StateParamMap
 
 path="./results/CutFEM_thermal_compliance_ALM_island_detect/"
 rm(path,force=true,recursive=true)
@@ -79,8 +79,8 @@ state_collection = EmbeddedCollection(model,φh) do _,_
   state_map = AffineFEStateMap(a,l,U,V,V_φ,U_reg,φh)
   (;
     :state_map => state_map,
-    :J => StateParamIntegrandWithMeasure(J,state_map),
-    :C => map(Ci -> StateParamIntegrandWithMeasure(Ci,state_map),[Vol,])
+    :J => StateParamMap(J,state_map),
+    :C => map(Ci -> StateParamMap(Ci,state_map),[Vol,])
   )
 end
 pcfs = EmbeddedPDEConstrainedFunctionals(state_collection;analytic_dC=(dVol,))

diff --git a/scripts/Embedded/Examples/FCM_2d_compliance_L.jl b/scripts/Embedded/Examples/FCM_2d_compliance_L.jl
@@ -2,7 +2,7 @@ using Gridap,GridapTopOpt, GridapSolvers
 using Gridap.Adaptivity, Gridap.Geometry
 using GridapEmbedded, GridapEmbedded.LevelSetCutters
 
-using GridapTopOpt: StateParamIntegrandWithMeasure
+using GridapTopOpt: StateParamMap
 
 path="./results/FCM_elastic_compliance_LShape_ALM_n100/"
 rm(path,force=true,recursive=true)

diff --git a/scripts/Embedded/Examples/FCM_2d_thermal.jl b/scripts/Embedded/Examples/FCM_2d_thermal.jl
@@ -2,7 +2,7 @@ using Gridap,GridapTopOpt, GridapSolvers
 using Gridap.Adaptivity, Gridap.Geometry
 using GridapEmbedded, GridapEmbedded.LevelSetCutters
 
-using GridapTopOpt: StateParamIntegrandWithMeasure
+using GridapTopOpt: StateParamMap
 
 path="./results/FCM_thermal_compliance_ALM/"
 rm(path,force=true,recursive=true)

diff --git a/scripts/Embedded/Examples/FCM_2d_thermal_MPI.jl b/scripts/Embedded/Examples/FCM_2d_thermal_MPI.jl
@@ -2,7 +2,7 @@ using Gridap,GridapTopOpt, GridapSolvers
 using Gridap.Adaptivity, Gridap.Geometry
 using GridapEmbedded, GridapEmbedded.LevelSetCutters
 
-using GridapTopOpt: StateParamIntegrandWithMeasure
+using GridapTopOpt: StateParamMap
 
 using GridapDistributed, GridapPETSc, GridapSolvers,
   PartitionedArrays, GridapTopOpt, SparseMatricesCSR

diff --git a/scripts/Embedded/Examples/FCM_2d_thermal_with_NonDesignDom.jl b/scripts/Embedded/Examples/FCM_2d_thermal_with_NonDesignDom.jl
@@ -2,7 +2,7 @@ using Gridap,GridapTopOpt, GridapSolvers
 using Gridap.Adaptivity, Gridap.Geometry
 using GridapEmbedded, GridapEmbedded.LevelSetCutters
 
-using GridapTopOpt: StateParamIntegrandWithMeasure
+using GridapTopOpt: StateParamMap
 
 path="./results/FCM_thermal_compliance_ALM/"
 rm(path,force=true,recursive=true)

diff --git a/scripts/Embedded/Examples/PETSc_testing_2d_compliance_L_AgFEM_AMG.jl b/scripts/Embedded/Examples/PETSc_testing_2d_compliance_L_AgFEM_AMG.jl
@@ -2,7 +2,7 @@ using Gridap,GridapTopOpt, GridapSolvers
 using Gridap.Adaptivity, Gridap.Geometry
 using GridapEmbedded, GridapEmbedded.LevelSetCutters
 
-using GridapTopOpt: StateParamIntegrandWithMeasure
+using GridapTopOpt: StateParamMap
 
 using GridapPETSc, SparseMatricesCSR
 

diff --git a/scripts/Embedded/Examples/PETSc_testing_2d_compliance_L_CutFEM_AMG.jl b/scripts/Embedded/Examples/PETSc_testing_2d_compliance_L_CutFEM_AMG.jl
@@ -2,7 +2,7 @@ using Gridap,GridapTopOpt, GridapSolvers
 using Gridap.Adaptivity, Gridap.Geometry
 using GridapEmbedded, GridapEmbedded.LevelSetCutters
 
-using GridapTopOpt: StateParamIntegrandWithMeasure
+using GridapTopOpt: StateParamMap
 
 using GridapPETSc, SparseMatricesCSR
 
@@ -66,7 +66,7 @@ function main(n;order=1,γg=0.1)
   σ(ε) = λ*tr(ε)*one(ε) + 2*μ*ε
 
   g = VectorValue(0,-1)
-  a(u,v,φ) = ∫(ε(v) ⊙ (σ ∘ ε(u)))dΩin + 
+  a(u,v,φ) = ∫(ε(v) ⊙ (σ ∘ ε(u)))dΩin +
     ∫((γg*h)*jump(nΛ_D⋅∇(v)) ⋅ jump(nΛ_D⋅∇(u)))dΛ_D +
     ∫((γg*h^3)*jump(n_Γg⋅∇(v)) ⋅ jump(n_Γg⋅∇(u)))dΓg
   l(v,φ) = ∫(v⋅g)dΓ_N

diff --git a/scripts/Embedded/Examples/fsi/TO-2-CutFEM-stokes_fsi.jl b/scripts/Embedded/Examples/fsi/TO-2-CutFEM-stokes_fsi.jl
@@ -2,7 +2,7 @@ using Gridap, Gridap.Geometry, Gridap.Adaptivity
 using GridapEmbedded, GridapEmbedded.LevelSetCutters
 using GridapTopOpt
 
-using GridapTopOpt: StateParamIntegrandWithMeasure
+using GridapTopOpt: StateParamMap
 
 path = "./results/TO-2-CutFEM-stokes_fsi/"
 mkpath(path)
@@ -190,8 +190,8 @@ state_collection = EmbeddedCollection(model,φh) do _,_
   state_map = AffineFEStateMap(a_coupled,l_coupled,X,Y,V_φ,U_reg,φh)
   (;
     :state_map => state_map,
-    :J => StateParamIntegrandWithMeasure(J_comp,state_map),
-    :C => map(Ci -> StateParamIntegrandWithMeasure(Ci,state_map),[Vol,])
+    :J => StateParamMap(J_comp,state_map),
+    :C => map(Ci -> StateParamMap(Ci,state_map),[Vol,])
   )
 end
 pcfs = EmbeddedPDEConstrainedFunctionals(state_collection)

diff --git a/scripts/Embedded/MWEs/zygote/thermal_compliance_ALM copy.jl b/scripts/Embedded/MWEs/zygote/thermal_compliance_ALM copy.jl
@@ -62,8 +62,8 @@ dVol(q,u,φ) = ∫(-1/vol_D*q*(DH ∘ φ)*(norm ∘ ∇(φ)))dΩ
 
 state_map = AffineFEStateMap(a,l,U,V,V_φ,V_φ,φh)
 
-# Create StateParamIntegrandWithMeasures
-_J = GridapTopOpt.StateParamIntegrandWithMeasure(J,state_map)
+# Create StateParamMaps
+_J = GridapTopOpt.StateParamMap(J,state_map)
 
 function φ_to_j(φ)
   u = state_map(φ)

diff --git a/scripts/Embedded/MWEs/zygote/thermal_compliance_ALM copy_2.jl b/scripts/Embedded/MWEs/zygote/thermal_compliance_ALM copy_2.jl
@@ -67,8 +67,8 @@ dVol(q,u,φ) = ∫(-1/vol_D*q*(DH ∘ φ)*(norm ∘ ∇(φ)))dΩ
 
 state_map = AffineFEStateMap(a,l,U,V,V_φ,V_φ,φh)
 
-# Create StateParamIntegrandWithMeasures
-_J = GridapTopOpt.StateParamIntegrandWithMeasure(J,state_map)
+# Create StateParamMaps
+_J = GridapTopOpt.StateParamMap(J,state_map)
 
 function φ_to_j(φ)
   u = state_map(φ)