Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ version = "1.0.0-DEV"

[deps]
AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
AllocCheck = "9b6a8646-10ed-4001-bbdc-1d2f46dfbb1a"
BlockArrays = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
DrWatson = "634d3b9d-ee7a-5ddf-bec9-22491ea816e1"
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
Expand All @@ -18,10 +17,8 @@ IterativeSolvers = "42fd0dbc-a981-5370-80f2-aaf504508153"
JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
PartitionedArrays = "5a9dfac6-5c52-46f7-8278-5e2210713be9"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
Profile = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79"
ProfileView = "c46f51b8-102a-5cf2-8d2c-8597cb0e0da7"
Roots = "f2b01f46-fcfa-551c-844a-d8ac1e96c665"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
WriteVTK = "64499a7a-5c06-52f2-abe2-ccb03c286192"
9 changes: 2 additions & 7 deletions src/ComputationalModels/ComputationalModels.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
module ComputationalModels
using DrWatson
using HyperFEM.PhysicalModels
using HyperFEM.Solvers

Expand All @@ -13,7 +12,7 @@ import Gridap: solve!

using BlockArrays
using GridapPETSc, GridapPETSc.PETSC
using GridapPETSc: PetscScalar, PetscInt, PETSC, @check_error_code
using GridapPETSc: PetscScalar, PetscInt, PETSC

using GridapDistributed
using GridapDistributed: DistributedDiscreteModel, DistributedTriangulation,
Expand All @@ -22,21 +21,18 @@ using GridapDistributed: DistributedDiscreteModel, DistributedTriangulation,
DistributedMultiFieldFEBasis, BlockPMatrix, BlockPVector, change_ghost

using PartitionedArrays
using PartitionedArrays: getany, tuple_of_arrays, matching_ghost_indices
using PartitionedArrays: getany

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: init!, update!, finalize!
using GridapSolvers.SolverInterfaces: finished, print_message, converged

using LinearAlgebra
using WriteVTK

using GridapGmsh
using GridapGmsh: GmshDiscreteModel
using GridapGmsh:@check_if_loaded
# using Gmsh: Gmsh, gmsh


include("BoundaryConditions.jl")
Expand Down Expand Up @@ -71,7 +67,6 @@ export StaticNonlinearModel
export DynamicNonlinearModel
export StaticLinearModel
export solve!
# export evaluate!
export dirichlet_preconditioning!
export get_state
export get_measure
Expand Down
27 changes: 0 additions & 27 deletions src/ComputationalModels/GridapExtras.jl
Original file line number Diff line number Diff line change
@@ -1,32 +1,5 @@
using Gridap.CellData

# function Gridap.CellData.evaluate!(cache,f::CellState,x::CellPoint)
# f.values
# end

# function GridapGmsh.GmshDiscreteModel(mshfile; terminal=1, renumber=true)

# @check_if_loaded
# if !isfile(mshfile)
# error("Msh file not found: $mshfile")
# end

# gmsh.initialize()
# gmsh.option.setNumber("General.Terminal", terminal)
# gmsh.option.setNumber("Mesh.SaveAll", 1)
# gmsh.option.setNumber("Mesh.MedImportGroupsOfNodes", 1)
# gmsh.open(mshfile)
# renumber && gmsh.model.mesh.renumberNodes()
# renumber && gmsh.model.mesh.renumberElements()
# model = GmshDiscreteModel(gmsh)
# gmsh.finalize()
# model
# end

# function Gridap.CellData.evaluate!(cache,f::CellState,x::CellPoint)
# f.values
# end


function repeat_spaces(nblocks::Integer,U0::FESpace,V0::FESpace)
U = MultiFieldFESpace([U0 for i in 1:nblocks];style=BlockMultiFieldStyle())
Expand Down
2 changes: 1 addition & 1 deletion src/PhysicalModels/PhysicalModels.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module PhysicalModels
using Gridap
using Gridap.CellData
using Gridap.Helpers
using DrWatson

using DrWatson
using ForwardDiff
using LinearAlgebra
using ..TensorAlgebra
Expand Down
44 changes: 0 additions & 44 deletions src/WeakForms/WeakForms.jl
Original file line number Diff line number Diff line change
Expand Up @@ -422,48 +422,4 @@ function jacobian(physicalmodel::ThermoElectroMech_PINNs, kine::NTuple{2,Kinemat
end







# ===================
# Time Integrators+
# ===================

# abstract type TimeIntegrator end

# struct MidPoint <: TimeIntegrator
# res::A
# jac::B
# params::A
# function MidPoint(res_,jac_, dΩ; αray = 0.4, ρ = 1.0, Δt = 5.0)

# res(u, v) = mass_term(u, v, 2.0 * ρ / Δt^2, dΩ)-
# 0.5 * res_(u, v)+
# 0.5 * res_(u⁻, v)+


# res(t, u⁻, vh) = (u, v) -> mass_term(u, v, 2.0 * ρ / Δt^2, dΩ) -
# mass_term(u⁻, v, 2.0 * ρ / Δt^2, dΩ) -
# mass_term(vh, v, 2.0 * ρ / Δt, dΩ) +
# 0.5 * res_(physmodel, u, v, dΩ) +
# 0.5 * res_(physmodel, u⁻, v, dΩ) +
# mass_term(u, v, αray * ρ / Δt, dΩ) -
# mass_term(u⁻, v, αray * ρ / Δt, dΩ)


# params=(; αray = αray, ρ = ρ, Δt = Δt)
# A,B,C= typeof(res), typeof(jac), typeof(params)
# new{A,B,C}(res,jac,params)
# end
# end

# Midpoint Integrator
# -------------------
# function residual(, (u, φ), (v, vφ), dΩ)

# end


end