aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Carpet/CarpetLib/src/prolongate_3d_real8_2tl.F777
-rw-r--r--Carpet/CarpetLib/src/prolongate_3d_real8_2tl_o3.F777
-rw-r--r--Carpet/CarpetLib/src/prolongate_3d_real8_3tl.F777
-rw-r--r--Carpet/CarpetLib/src/prolongate_3d_real8_3tl_o3.F777
-rw-r--r--Carpet/CarpetLib/src/th.cc4
5 files changed, 21 insertions, 11 deletions
diff --git a/Carpet/CarpetLib/src/prolongate_3d_real8_2tl.F77 b/Carpet/CarpetLib/src/prolongate_3d_real8_2tl.F77
index 46979c219..0ac9ec5a9 100644
--- a/Carpet/CarpetLib/src/prolongate_3d_real8_2tl.F77
+++ b/Carpet/CarpetLib/src/prolongate_3d_real8_2tl.F77
@@ -1,5 +1,5 @@
c -*-Fortran-*-
-c $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/prolongate_3d_real8_2tl.F77,v 1.6 2002/09/25 15:49:16 schnetter Exp $
+c $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/prolongate_3d_real8_2tl.F77,v 1.7 2002/09/25 19:54:08 schnetter Exp $
#include "cctk.h"
@@ -13,6 +13,9 @@ c $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/prolongate_3d
CCTK_REAL8 one
parameter (one = 1)
+ CCTK_REAL8 eps
+ parameter (eps = 1.0d-10)
+
integer srciext, srcjext, srckext
CCTK_REAL8 src1(srciext,srcjext,srckext)
CCTK_REAL8 t1
@@ -105,7 +108,7 @@ c Linear (first order) interpolation
if (t1.eq.t2) then
call CCTK_WARN (0, "Internal error: arrays have same time")
end if
- if (t.lt.min(t1,t2) .or. t.gt.max(t1,t2)) then
+ if (t.lt.min(t1,t2)-eps .or. t.gt.max(t1,t2)+eps) then
call CCTK_WARN (0, "Internal error: extrapolation")
end if
diff --git a/Carpet/CarpetLib/src/prolongate_3d_real8_2tl_o3.F77 b/Carpet/CarpetLib/src/prolongate_3d_real8_2tl_o3.F77
index 145b7aeb9..fab696367 100644
--- a/Carpet/CarpetLib/src/prolongate_3d_real8_2tl_o3.F77
+++ b/Carpet/CarpetLib/src/prolongate_3d_real8_2tl_o3.F77
@@ -1,5 +1,5 @@
c -*-Fortran-*-
-c $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/prolongate_3d_real8_2tl_o3.F77,v 1.8 2002/09/25 15:49:16 schnetter Exp $
+c $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/prolongate_3d_real8_2tl_o3.F77,v 1.9 2002/09/25 19:54:08 schnetter Exp $
#include "cctk.h"
@@ -13,6 +13,9 @@ c $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/prolongate_3d
CCTK_REAL8 one
parameter (one = 1)
+ CCTK_REAL8 eps
+ parameter (eps = 1.0d-10)
+
integer srciext, srcjext, srckext
CCTK_REAL8 src1(srciext,srcjext,srckext)
CCTK_REAL8 t1
@@ -114,7 +117,7 @@ c Linear (first order) interpolation
if (t1.eq.t2) then
call CCTK_WARN (0, "Internal error: arrays have same time")
end if
- if (t.lt.min(t1,t2) .or. t.gt.max(t1,t2)) then
+ if (t.lt.min(t1,t2)-eps .or. t.gt.max(t1,t2)+eps) then
call CCTK_WARN (0, "Internal error: extrapolation")
end if
diff --git a/Carpet/CarpetLib/src/prolongate_3d_real8_3tl.F77 b/Carpet/CarpetLib/src/prolongate_3d_real8_3tl.F77
index 6a41b64c4..30b64d27c 100644
--- a/Carpet/CarpetLib/src/prolongate_3d_real8_3tl.F77
+++ b/Carpet/CarpetLib/src/prolongate_3d_real8_3tl.F77
@@ -1,5 +1,5 @@
c -*-Fortran-*-
-c $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/prolongate_3d_real8_3tl.F77,v 1.4 2002/09/25 15:49:16 schnetter Exp $
+c $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/prolongate_3d_real8_3tl.F77,v 1.5 2002/09/25 19:54:08 schnetter Exp $
#include "cctk.h"
@@ -13,6 +13,9 @@ c $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/prolongate_3d
CCTK_REAL8 one
parameter (one = 1)
+ CCTK_REAL8 eps
+ parameter (eps = 1.0d-10)
+
integer srciext, srcjext, srckext
CCTK_REAL8 src1(srciext,srcjext,srckext)
CCTK_REAL8 t1
@@ -107,7 +110,7 @@ c Quadratic (second order) interpolation
if (t1.eq.t2 .or. t1.eq.t3 .or. t2.eq.t3) then
call CCTK_WARN (0, "Internal error: arrays have same time")
end if
- if (t.lt.min(t1,t2,t3) .or. t.gt.max(t1,t2,t3)) then
+ if (t.lt.min(t1,t2,t3)-eps .or. t.gt.max(t1,t2,t3)+eps) then
call CCTK_WARN (0, "Internal error: extrapolation")
end if
diff --git a/Carpet/CarpetLib/src/prolongate_3d_real8_3tl_o3.F77 b/Carpet/CarpetLib/src/prolongate_3d_real8_3tl_o3.F77
index b36f51439..03e671663 100644
--- a/Carpet/CarpetLib/src/prolongate_3d_real8_3tl_o3.F77
+++ b/Carpet/CarpetLib/src/prolongate_3d_real8_3tl_o3.F77
@@ -1,5 +1,5 @@
c -*-Fortran-*-
-c $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/prolongate_3d_real8_3tl_o3.F77,v 1.8 2002/09/25 15:49:16 schnetter Exp $
+c $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/prolongate_3d_real8_3tl_o3.F77,v 1.9 2002/09/25 19:54:08 schnetter Exp $
#include "cctk.h"
@@ -13,6 +13,9 @@ c $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/prolongate_3d
CCTK_REAL8 one
parameter (one = 1)
+ CCTK_REAL8 eps
+ parameter (eps = 1.0d-10)
+
integer srciext, srcjext, srckext
CCTK_REAL8 src1(srciext,srcjext,srckext)
CCTK_REAL8 t1
@@ -116,7 +119,7 @@ c Quadratic (second order) interpolation
if (t1.eq.t2 .or. t1.eq.t3 .or. t2.eq.t3) then
call CCTK_WARN (0, "Internal error: arrays have same time")
end if
- if (t.lt.min(t1,t2,t3) .or. t.gt.max(t1,t2,t3)) then
+ if (t.lt.min(t1,t2,t3)-eps .or. t.gt.max(t1,t2,t3)+eps) then
call CCTK_WARN (0, "Internal error: extrapolation")
end if
diff --git a/Carpet/CarpetLib/src/th.cc b/Carpet/CarpetLib/src/th.cc
index 7dc292585..b9a42c4c4 100644
--- a/Carpet/CarpetLib/src/th.cc
+++ b/Carpet/CarpetLib/src/th.cc
@@ -6,7 +6,7 @@
copyright : (C) 2000 by Erik Schnetter
email : schnetter@astro.psu.edu
- $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/th.cc,v 1.8 2002/09/25 15:49:17 schnetter Exp $
+ $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/th.cc,v 1.9 2002/09/25 19:54:08 schnetter Exp $
***************************************************************************/
@@ -67,8 +67,6 @@ void th::recompose () {
if (rl==0 && ml==0) {
deltas[rl][ml] = delta;
} else if (ml==0) {
-// assert (deltas[rl-1][ml] % h->reffact == 0);
- assert (fabs(fmod(deltas[rl-1][ml], h->reffact)) < 1e-10);
deltas[rl][ml] = deltas[rl-1][ml] / h->reffact;
} else {
deltas[rl][ml] = deltas[rl][ml-1] * h->mgfact;
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-26 05:11:06 +0000