Added GridaODEs submodule

oriolcg · oriolcg · commit d1bfa5e22826 · 2022-02-17T11:03:25.000+01:00
diff --git a/src/GridapDistributed.jl b/src/GridapDistributed.jl
@@ -11,8 +11,6 @@ using Gridap.CellData
 using Gridap.Visualization
 using Gridap.FESpaces
 using Gridap.MultiField
-using GridapODEs.TransientFETools
-using GridapODEs.ODETools
 
 using PartitionedArrays
 const PArrays = PartitionedArrays
@@ -25,7 +23,6 @@ import Gridap.TensorValues: inner, outer, double_contraction, symmetric_part
 import LinearAlgebra: det, tr, cross, dot, ⋅
 import Base: inv, abs, abs2, *, +, -, /, adjoint, transpose, real, imag, conj
 import Gridap.Fields: grad2curl
-import GridapODEs.ODETools: ∂t, ∂tt
 
 export FullyAssembledRows
 export SubAssembledRows
@@ -44,10 +41,6 @@ include("DivConformingFESpaces.jl")
 
 include("MultiField.jl")
 
-include("TransientDistributedCellField.jl")
-
-include("TransientMultiFieldDistributedCellField.jl")
-
-include("TransientFESpaces.jl")
+include("GridapODEs/GridapODEs.jl")
 
 end # module
diff --git a/src/GridapODEs/GridapODEs.jl b/src/GridapODEs/GridapODEs.jl
@@ -0,0 +1,35 @@
+module GridapODEs
+
+using GridapDistributed: DistributedCellDatum, DistributedCellField, DistributedMeasure
+using GridapDistributed: DistributedSingleFieldFEFunction, DistributedMultiFieldFEFunction
+using GridapDistributed: DistributedSingleFieldFESpace, DistributedMultiFieldFESpace
+using GridapDistributed: local_views
+using Gridap.Fields
+using Gridap.Geometry
+using Gridap.Arrays
+using Gridap.CellData
+using Gridap.Algebra
+using Gridap.FESpaces
+using Gridap.MultiField: num_fields
+using Gridap.Helpers: first_and_tail
+using GridapODEs.TransientFETools
+using GridapODEs.ODETools
+using PartitionedArrays
+
+import GridapODEs.ODETools: ∂t, ∂tt
+import Gridap.TensorValues: inner, outer, double_contraction, symmetric_part
+import LinearAlgebra: det, tr, cross, dot, ⋅
+import Base: inv, abs, abs2, *, +, -, /, adjoint, transpose, real, imag, conj
+import Gridap.Fields: grad2curl
+
+export TransientDistributedCellField
+export TransientSingleFieldDistributedCellField
+export TransientMultiFieldDistributedCellField
+
+include("TransientDistributedCellField.jl")
+
+include("TransientMultiFieldDistributedCellField.jl")
+
+include("TransientFESpaces.jl")
+
+end
diff --git a/src/GridapODEs/TransientDistributedCellField.jl b/src/GridapODEs/TransientDistributedCellField.jl
diff --git a/src/GridapODEs/TransientFESpaces.jl b/src/GridapODEs/TransientFESpaces.jl
diff --git a/src/GridapODEs/TransientMultiFieldDistributedCellField.jl b/src/GridapODEs/TransientMultiFieldDistributedCellField.jl
diff --git a/test/GridapODEs/HeatEquationTests.jl b/test/GridapODEs/HeatEquationTests.jl
diff --git a/test/GridapODEs/StokesOpenBoundaryTests.jl b/test/GridapODEs/StokesOpenBoundaryTests.jl
diff --git a/test/GridapODEs/TransientDistributedCellFieldTests.jl b/test/GridapODEs/TransientDistributedCellFieldTests.jl
@@ -26,16 +26,16 @@ function main(parts)
   @test isa(dda(0),GridapDistributed.DistributedCellField)
 
   b(t) = TransientCellField(a(t),(da(t),dda(t)))
-  @test isa(b(0),GridapDistributed.TransientDistributedCellField)
-  @test isa(b(0),GridapDistributed.TransientSingleFieldDistributedCellField)
+  @test isa(b(0),GridapDistributed.GridapODEs.TransientDistributedCellField)
+  @test isa(b(0),GridapDistributed.GridapODEs.TransientSingleFieldDistributedCellField)
 
   db(t) = ∂t(b(t))
-  @test isa(db(0),GridapDistributed.TransientDistributedCellField)
-  @test isa(db(0),GridapDistributed.TransientSingleFieldDistributedCellField)
+  @test isa(db(0),GridapDistributed.GridapODEs.TransientDistributedCellField)
+  @test isa(db(0),GridapDistributed.GridapODEs.TransientSingleFieldDistributedCellField)
 
   ddb(t) = ∂t(db(t))
-  @test isa(ddb(0),GridapDistributed.TransientDistributedCellField)
-  @test isa(ddb(0),GridapDistributed.TransientSingleFieldDistributedCellField)
+  @test isa(ddb(0),GridapDistributed.GridapODEs.TransientDistributedCellField)
+  @test isa(ddb(0),GridapDistributed.GridapODEs.TransientSingleFieldDistributedCellField)
 
   @test (∑(∫(a(0.5))dΩ)) ≈ 0.25
   @test (∑(∫(da(0.5))dΩ)) ≈ 1.0
diff --git a/test/GridapODEs/TransientMultiFieldDistributedCellFieldTests.jl b/test/GridapODEs/TransientMultiFieldDistributedCellFieldTests.jl
@@ -35,28 +35,28 @@ function main(parts)
   @test isa(dda(0),GridapDistributed.DistributedMultiFieldFEFunction)
 
   b(t) = TransientCellField(a(t),(da(t),dda(t)))
-  @test isa(b(0),GridapDistributed.TransientDistributedCellField)
-  @test isa(b(0),GridapDistributed.TransientMultiFieldDistributedCellField)
+  @test isa(b(0),GridapDistributed.GridapODEs.TransientDistributedCellField)
+  @test isa(b(0),GridapDistributed.GridapODEs.TransientMultiFieldDistributedCellField)
 
   db(t) = ∂t(b(t))
-  @test isa(db(0),GridapDistributed.TransientDistributedCellField)
-  @test isa(db(0),GridapDistributed.TransientMultiFieldDistributedCellField)
+  @test isa(db(0),GridapDistributed.GridapODEs.TransientDistributedCellField)
+  @test isa(db(0),GridapDistributed.GridapODEs.TransientMultiFieldDistributedCellField)
 
   ddb(t) = ∂t(db(t))
-  @test isa(ddb(0),GridapDistributed.TransientDistributedCellField)
-  @test isa(ddb(0),GridapDistributed.TransientMultiFieldDistributedCellField)
+  @test isa(ddb(0),GridapDistributed.GridapODEs.TransientDistributedCellField)
+  @test isa(ddb(0),GridapDistributed.GridapODEs.TransientMultiFieldDistributedCellField)
 
   b1(t) = b(t)[1]
-  @test isa(b1(0),GridapDistributed.TransientDistributedCellField)
-  @test isa(b1(0),GridapDistributed.TransientSingleFieldDistributedCellField)
+  @test isa(b1(0),GridapDistributed.GridapODEs.TransientDistributedCellField)
+  @test isa(b1(0),GridapDistributed.GridapODEs.TransientSingleFieldDistributedCellField)
 
   db1(t) = ∂t(b1(t))
-  @test isa(db1(0),GridapDistributed.TransientDistributedCellField)
-  @test isa(db1(0),GridapDistributed.TransientSingleFieldDistributedCellField)
+  @test isa(db1(0),GridapDistributed.GridapODEs.TransientDistributedCellField)
+  @test isa(db1(0),GridapDistributed.GridapODEs.TransientSingleFieldDistributedCellField)
 
   ddb1(t) = ∂t(db1(t))
-  @test isa(ddb1(0),GridapDistributed.TransientDistributedCellField)
-  @test isa(ddb1(0),GridapDistributed.TransientSingleFieldDistributedCellField)
+  @test isa(ddb1(0),GridapDistributed.GridapODEs.TransientDistributedCellField)
+  @test isa(ddb1(0),GridapDistributed.GridapODEs.TransientSingleFieldDistributedCellField)
 
   @test (∑(∫(b(0.5)[1])dΩ)) == (∑(∫(b1(0.5))dΩ))
   @test (∑(∫(db(0.5)[1])dΩ)) == (∑(∫(db1(0.5))dΩ))
diff --git a/test/TestApp/src/TestApp.jl b/test/TestApp/src/TestApp.jl
@@ -6,4 +6,8 @@ module TestApp
   include("../../PLaplacianTests.jl")
   include("../../PoissonTests.jl")
   include("../../PeriodicBCsTests.jl")
-end 
+  include("../../GridapODEs/TransientDistributedCellFieldTests.jl")
+  include("../../GridapODEs/TransientMultiFieldDistributedCellFieldTests.jl")
+  include("../../GridapODEs/HeatEquationTests.jl")
+  include("../../GridapODEs/StokesOpenBoundaryTests.jl")
+end
diff --git a/test/sequential/GridapODEs/HeatEquationTests.jl b/test/sequential/GridapODEs/HeatEquationTests.jl
@@ -1,5 +1,5 @@
 module HeatEquationTestsSeq
 using PartitionedArrays
-include("../HeatEquationTests.jl")
+include("../../GridapODEs/HeatEquationTests.jl")
 prun(HeatEquationTests.main,sequential,(2,2))
 end # module
diff --git a/test/sequential/GridapODEs/StokesOpenBoundaryTests.jl b/test/sequential/GridapODEs/StokesOpenBoundaryTests.jl
@@ -1,5 +1,5 @@
 module StokesOpenBoundaryTestsSeq
 using PartitionedArrays
-include("../StokesOpenBoundaryTests.jl")
+include("../../GridapODEs/StokesOpenBoundaryTests.jl")
 prun(StokesOpenBoundaryTests.main,sequential,(2,2))
 end # module
diff --git a/test/sequential/GridapODEs/TransientDistributedCellFieldTests.jl b/test/sequential/GridapODEs/TransientDistributedCellFieldTests.jl
@@ -1,5 +1,5 @@
 module TransientDistributedCellFieldTestsSeq
 using PartitionedArrays
-include("../TransientDistributedCellFieldTests.jl")
+include("../../GridapODEs/TransientDistributedCellFieldTests.jl")
 prun(TransientDistributedCellFieldTests.main,sequential,(2,2))
 end # module
diff --git a/test/sequential/GridapODEs/TransientMultiFieldDistributedCellFieldTests.jl b/test/sequential/GridapODEs/TransientMultiFieldDistributedCellFieldTests.jl
@@ -1,5 +1,5 @@
 module TransientMultiFieldDistributedCellFieldTestsSeq
 using PartitionedArrays
-include("../TransientMultiFieldDistributedCellFieldTests.jl")
+include("../../GridapODEs/TransientMultiFieldDistributedCellFieldTests.jl")
 prun(TransientMultiFieldDistributedCellFieldTests.main,sequential,(2,2))
 end # module
diff --git a/test/sequential/GridapODEs/runtests.jl b/test/sequential/GridapODEs/runtests.jl
@@ -0,0 +1,17 @@
+module GridapODEsTests
+
+using Test
+
+@time @testset "TransientDistributedCellFieldTests" begin
+  include("TransientDistributedCellFieldTests.jl")
+end
+
+@time @testset "TransientMultiFieldDistributedCellFieldTests" begin
+  include("TransientMultiFieldDistributedCellFieldTests.jl")
+end
+
+@time @testset "HeatEquation" begin include("HeatEquationTests.jl") end
+
+@time @testset "StokesOpenBoundary" begin include("StokesOpenBoundaryTests.jl") end
+
+end
diff --git a/test/sequential/runtests.jl b/test/sequential/runtests.jl
@@ -18,16 +18,6 @@ using Test
 
 @time @testset "DivConformingTests" begin include("DivConformingTests.jl") end
 
-@time @testset "TransientDistributedCellFieldTests" begin
-  include("TransientDistributedCellFieldTests.jl")
-end
-
-@time @testset "TransientMultiFieldDistributedCellFieldTests" begin
-  include("TransientMultiFieldDistributedCellFieldTests.jl")
-end
-
-@time @testset "HeatEquation" begin include("HeatEquationTests.jl") end
-
-@time @testset "StokesOpenBoundary" begin include("StokesOpenBoundaryTests.jl") end
+@time @testset "GridapODEs" begin include("GridapODEs/runtests.jl") end
 
 end # module
