From: Michael Orlitzky Date: Fri, 7 Dec 2018 15:41:20 +0000 (-0500) Subject: src/FEM/R1.hs: fix monomorphism restriction warnings. X-Git-Url: http://gitweb.michael.orlitzky.com/?a=commitdiff_plain;ds=sidebyside;h=84bf90406341348a41c7cc57c3d365238690a930;p=numerical-analysis.git src/FEM/R1.hs: fix monomorphism restriction warnings. --- diff --git a/src/FEM/R1.hs b/src/FEM/R1.hs index dd5c11b..7b89ffa 100644 --- a/src/FEM/R1.hs +++ b/src/FEM/R1.hs @@ -190,11 +190,11 @@ affine (x1,x2) x = (fromInteger 2)*(x - x1)/(x2 - x1) - (fromInteger 1) -- >>> phi 1 -- 7.0 -- -affine_inv :: Field.C a => (a,a) -> (a -> a) +affine_inv :: forall a. Field.C a => (a,a) -> (a -> a) affine_inv (x1,x2) x = x*(x2 - x1)/two + (x1 + x2)/two where - two = fromInteger 2 + two = fromInteger 2 :: a -- * Load vector @@ -221,9 +221,9 @@ big_N k x | otherwise = coeff * ( legendre k x - legendre (k-2) x ) where - two = fromInteger 2 - four = fromInteger 4 - coeff = one / (sqrt (four*(fromInteger k) - two)) :: a + two = fromInteger 2 :: a + four = fromInteger 4 :: a + coeff = one / (sqrt (four*(fromInteger k) - two)) -- | A matrix containing 'big_N' functions indexed by their @@ -311,7 +311,7 @@ big_F pde params = accum i j prev_F this_N = prev_F + this_F where - two = fromInteger 2 + two = fromInteger 2 :: a (x1,x2) = (mesh params) !!! (i,0) q = affine_inv (x1,x2) integrand x = ((f pde) (q x)) * (this_N x) @@ -347,8 +347,8 @@ big_N' k x | k == 1 = one / (fromInteger 2) | otherwise = coeff * ( legendre k x ) where - two = fromInteger 2 - coeff = sqrt ((two*(fromInteger k) + one) / two) :: a + two = fromInteger 2 :: a + coeff = sqrt ((two*(fromInteger k) + one) / two) -- | The matrix of (N_i' * N_j') functions used in the integrand of @@ -378,7 +378,7 @@ big_K_elem pde params _ k cur_K _ = accum i j prev_K these_N's = prev_K + this_K where - two = fromInteger 2 + two = fromInteger 2 :: a (x1,x2) = (mesh params) !!! (k,0) q = affine_inv (x1,x2) integrand x = ((big_A pde) (q x)) * (these_N's x) @@ -447,7 +447,7 @@ big_M_elem pde params _ k cur_M _ = accum i j prev_M these_Ns = prev_M + this_M where - two = fromInteger 2 + two = fromInteger 2 :: a (x1,x2) = (mesh params) !!! (k,0) q = affine_inv (x1,x2) integrand x = ((c pde) (q x)) * (these_Ns x) @@ -602,7 +602,7 @@ relative_error :: forall m n l a. relative_error pde params energy_true = cent * sqrt(energy_true - (energy_fem pde params)/energy_true) where - cent = fromInteger 100 + cent = fromInteger 100 :: a @@ -618,4 +618,4 @@ relative_error_pointwise pde params u x = cent * ( abs $ (u x) - u_fem ) / ( abs $ u x ) where u_fem = evaluate' (solution pde params) x - cent = fromInteger 100 + cent = fromInteger 100 :: a