changeset 335:f4e3e71a4ff4 refactor/combine_to_one_package

Fix `using` commands to refer to local modules within the Sbplib package/module
author Jonatan Werpers <jonatan@werpers.com>
date Fri, 25 Sep 2020 13:25:32 +0200
parents 91e015880ae6
children e50f130c37fd
files sbp.jl src/DiffOps/DiffOps.jl src/Grids/Grids.jl src/LazyTensors/LazyTensors.jl src/SbpOperators/SbpOperators.jl src/Sbplib.jl test/testDiffOps.jl test/testGrids.jl test/testLazyTensors.jl test/testRegionInidices.jl test/testSbpOperators.jl
diffstat 11 files changed, 31 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/sbp.jl	Fri Sep 25 13:13:07 2020 +0200
+++ b/sbp.jl	Fri Sep 25 13:25:32 2020 +0200
@@ -1,9 +1,9 @@
 module sbp
 
-using Grids
-using RegionIndices
-using SbpOperators
-using DiffOps
+using Sbplib.Grids
+using Sbplib.RegionIndices
+using Sbplib.SbpOperators
+using Sbplib.DiffOps
 
 include("TimeStepper.jl")
 end  # module
--- a/src/DiffOps/DiffOps.jl	Fri Sep 25 13:13:07 2020 +0200
+++ b/src/DiffOps/DiffOps.jl	Fri Sep 25 13:25:32 2020 +0200
@@ -1,9 +1,9 @@
 module DiffOps
 
-using RegionIndices
-using SbpOperators
-using Grids
-using LazyTensors
+using Sbplib.RegionIndices
+using Sbplib.SbpOperators
+using Sbplib.Grids
+using Sbplib.LazyTensors
 
 """
     DiffOp
--- a/src/Grids/Grids.jl	Fri Sep 25 13:13:07 2020 +0200
+++ b/src/Grids/Grids.jl	Fri Sep 25 13:25:32 2020 +0200
@@ -1,6 +1,6 @@
 module Grids
 
-using RegionIndices
+using Sbplib.RegionIndices
 
 export BoundaryIdentifier, CartesianBoundary
 
--- a/src/LazyTensors/LazyTensors.jl	Fri Sep 25 13:13:07 2020 +0200
+++ b/src/LazyTensors/LazyTensors.jl	Fri Sep 25 13:25:32 2020 +0200
@@ -1,5 +1,5 @@
 module LazyTensors
-using RegionIndices
+using Sbplib.RegionIndices
 include("tensor_mapping.jl")
 include("lazy_array.jl")
 include("lazy_tensor_operations.jl")
--- a/src/SbpOperators/SbpOperators.jl	Fri Sep 25 13:13:07 2020 +0200
+++ b/src/SbpOperators/SbpOperators.jl	Fri Sep 25 13:25:32 2020 +0200
@@ -1,7 +1,7 @@
 module SbpOperators
 
-using RegionIndices
-using LazyTensors
+using Sbplib.RegionIndices
+using Sbplib.LazyTensors
 
 include("stencil.jl")
 include("constantstenciloperator.jl")
--- a/src/Sbplib.jl	Fri Sep 25 13:13:07 2020 +0200
+++ b/src/Sbplib.jl	Fri Sep 25 13:25:32 2020 +0200
@@ -1,15 +1,15 @@
 module Sbplib
 
-include("DiffOps/DiffOps.jl")
-include("Grids/Grids.jl")
+include("RegionIndices/RegionIndices.jl")
 include("LazyTensors/LazyTensors.jl")
-include("RegionIndices/RegionIndices.jl")
+include("Grids/Grids.jl")
 include("SbpOperators/SbpOperators.jl")
+include("DiffOps/DiffOps.jl")
 
-export DiffOps
-export Grids
+export RegionIndices
 export LazyTensors
-export RegionIndices
+export Grids
 export SbpOperators
+export DiffOps
 
 end
--- a/test/testDiffOps.jl	Fri Sep 25 13:13:07 2020 +0200
+++ b/test/testDiffOps.jl	Fri Sep 25 13:25:32 2020 +0200
@@ -1,10 +1,9 @@
 using Test
-using Sbplib
-using DiffOps
-using Grids
-using SbpOperators
-using RegionIndices
-using LazyTensors
+using Sbplib.DiffOps
+using Sbplib.Grids
+using Sbplib.SbpOperators
+using Sbplib.RegionIndices
+using Sbplib.LazyTensors
 
 @testset "Laplace2D" begin
     op = readOperator(sbp_operators_path()*"d2_4th.txt",sbp_operators_path()*"h_4th.txt")
--- a/test/testGrids.jl	Fri Sep 25 13:13:07 2020 +0200
+++ b/test/testGrids.jl	Fri Sep 25 13:25:32 2020 +0200
@@ -1,4 +1,4 @@
-using Grids
+using Sbplib.Grids
 using Test
 
 @testset "EquidistantGrid" begin
--- a/test/testLazyTensors.jl	Fri Sep 25 13:13:07 2020 +0200
+++ b/test/testLazyTensors.jl	Fri Sep 25 13:25:32 2020 +0200
@@ -1,6 +1,6 @@
 using Test
-using LazyTensors
-using RegionIndices
+using Sbplib.LazyTensors
+using Sbplib.RegionIndices
 
 @testset "Generic Mapping methods" begin
     struct DummyMapping{T,R,D} <: TensorMapping{T,R,D} end
--- a/test/testRegionInidices.jl	Fri Sep 25 13:13:07 2020 +0200
+++ b/test/testRegionInidices.jl	Fri Sep 25 13:25:32 2020 +0200
@@ -1,4 +1,4 @@
-using RegionIndices
+using Sbplib.RegionIndices
 using Test
 
 @test_broken false
--- a/test/testSbpOperators.jl	Fri Sep 25 13:13:07 2020 +0200
+++ b/test/testSbpOperators.jl	Fri Sep 25 13:25:32 2020 +0200
@@ -1,8 +1,8 @@
 using Test
-using SbpOperators
-using Grids
-using RegionIndices
-using LazyTensors
+using Sbplib.SbpOperators
+using Sbplib.Grids
+using Sbplib.RegionIndices
+using Sbplib.LazyTensors
 
 # @testset "apply_quadrature" begin
 #     op = readOperator(sbp_operators_path()*"d2_4th.txt",sbp_operators_path()*"h_4th.txt")