summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominic Steinitz <dominic@steinitz.org>2018-03-30 14:15:26 +0100
committerDominic Steinitz <dominic@steinitz.org>2018-03-30 14:15:26 +0100
commit5bcc77b1e115a8c8eb94a1aa1a441618bfeb0b54 (patch)
tree1471fa78eaa57e1807019fe4f10b20d2e2c27a4f
parent94d26eb8ef7cf236127e9e51bb3c46348c4c6cfc (diff)
Improve naming
-rw-r--r--packages/sundials/hmatrix-sundials.cabal7
-rw-r--r--packages/sundials/src/Arkode.hsc (renamed from packages/sundials/src/Bar.hsc)2
-rw-r--r--packages/sundials/src/Numeric/Sundials/ARKode/ODE.hs6
3 files changed, 6 insertions, 9 deletions
diff --git a/packages/sundials/hmatrix-sundials.cabal b/packages/sundials/hmatrix-sundials.cabal
index 83a30c7..7b44cea 100644
--- a/packages/sundials/hmatrix-sundials.cabal
+++ b/packages/sundials/hmatrix-sundials.cabal
@@ -1,6 +1,3 @@
1-- Initial sundials.cabal generated by cabal init. For further
2-- documentation, see http://haskell.org/cabal/users-guide/
3
4name: hmatrix-sundials 1name: hmatrix-sundials
5version: 0.1.0.0 2version: 0.1.0.0
6-- synopsis: 3-- synopsis:
@@ -29,14 +26,14 @@ library
29 hs-source-dirs: src 26 hs-source-dirs: src
30 exposed-modules: Numeric.Sundials.Arkode.ODE 27 exposed-modules: Numeric.Sundials.Arkode.ODE
31 other-modules: Types, 28 other-modules: Types,
32 Bar 29 Arkode
33 c-sources: src/helpers.c src/helpers.h 30 c-sources: src/helpers.c src/helpers.h
34 31
35executable sundials 32executable sundials
36 main-is: Main.hs 33 main-is: Main.hs
37 other-modules: Types, 34 other-modules: Types,
38 Numeric.Sundials.Arkode.ODE, 35 Numeric.Sundials.Arkode.ODE,
39 Bar 36 Arkode
40 other-extensions: QuasiQuotes 37 other-extensions: QuasiQuotes
41 build-depends: base >=4.10 && <4.11, 38 build-depends: base >=4.10 && <4.11,
42 inline-c >=0.6 && <0.7, 39 inline-c >=0.6 && <0.7,
diff --git a/packages/sundials/src/Bar.hsc b/packages/sundials/src/Arkode.hsc
index 26f0bf0..59e701e 100644
--- a/packages/sundials/src/Bar.hsc
+++ b/packages/sundials/src/Arkode.hsc
@@ -1,6 +1,6 @@
1{-# LANGUAGE RecordWildCards #-} 1{-# LANGUAGE RecordWildCards #-}
2 2
3module Bar where 3module Arkode where
4 4
5import Foreign 5import Foreign
6import Foreign.C.Types 6import Foreign.C.Types
diff --git a/packages/sundials/src/Numeric/Sundials/ARKode/ODE.hs b/packages/sundials/src/Numeric/Sundials/ARKode/ODE.hs
index a5083e3..30ff4c8 100644
--- a/packages/sundials/src/Numeric/Sundials/ARKode/ODE.hs
+++ b/packages/sundials/src/Numeric/Sundials/ARKode/ODE.hs
@@ -58,8 +58,8 @@ import Numeric.LinearAlgebra.Devel (createVector)
58import Numeric.LinearAlgebra.HMatrix (Vector, Matrix, toList, (><), subMatrix) 58import Numeric.LinearAlgebra.HMatrix (Vector, Matrix, toList, (><), subMatrix)
59 59
60import qualified Types as T 60import qualified Types as T
61import Bar (sDIRK_2_1_2, kVAERNO_4_2_3) 61import Arkode (sDIRK_2_1_2, kVAERNO_4_2_3)
62import qualified Bar as B 62import qualified Arkode as B
63 63
64 64
65C.context (C.baseCtx <> C.vecCtx <> C.funCtx <> T.sunCtx) 65C.context (C.baseCtx <> C.vecCtx <> C.funCtx <> T.sunCtx)
@@ -75,7 +75,7 @@ C.include "<arkode/arkode_direct.h>" -- access to ARKDls interface
75C.include "<sundials/sundials_types.h>" -- definition of type realtype 75C.include "<sundials/sundials_types.h>" -- definition of type realtype
76C.include "<sundials/sundials_math.h>" 76C.include "<sundials/sundials_math.h>"
77C.include "../../../helpers.h" 77C.include "../../../helpers.h"
78C.include "Bar_hsc.h" 78C.include "Arkode_hsc.h"
79 79
80 80
81getDataFromContents :: Storable b => Int -> Ptr a -> IO (V.Vector b) 81getDataFromContents :: Storable b => Int -> Ptr a -> IO (V.Vector b)