From bf210d8fafd5065bcc0522226b170daa7d4a5ada Mon Sep 17 00:00:00 2001 From: schnetter Date: Wed, 20 Feb 2008 00:29:16 +0000 Subject: Correct error in previous commit git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/CartGrid3D/trunk@237 c78560ca-4b45-4335-b268-5f3340f3cb52 --- src/CartGrid3D.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/CartGrid3D.c b/src/CartGrid3D.c index 1b6c967..d23d73c 100644 --- a/src/CartGrid3D.c +++ b/src/CartGrid3D.c @@ -284,19 +284,11 @@ void CartGrid3D_SetRanges(CCTK_ARGUMENTS) spacing[d] *= pow(cctkGH->cctk_convfac, cctkGH->cctk_convlevel); } - if (CCTK_IsFunctionAliased ("MultiPatch_ConvertFromPhysicalBoundary")) { - ierr = MultiPatch_ConvertFromPhysicalBoundary - (map, 3, physical_min, physical_max, interior_min, interior_max, - exterior_min, exterior_max, spacing); - if (ierr) - CCTK_WARN (0, "error returned from function MultiPatch_ConvertFromPhysicalBoundary"); - } else { - ierr = ConvertFromPhysicalBoundary - (3, physical_min, physical_max, interior_min, interior_max, - exterior_min, exterior_max, spacing); - if (ierr) - CCTK_WARN (0, "error returned from function ConvertFromPhysicalBoundary"); - } + ierr = ConvertFromPhysicalBoundary + (3, physical_min, physical_max, interior_min, interior_max, + exterior_min, exterior_max, spacing); + if (ierr) + CCTK_WARN (0, "error returned from function ConvertFromPhysicalBoundary"); for (d=0; d<3; ++d) { origin[d] = exterior_min[d]; @@ -340,11 +332,19 @@ void CartGrid3D_SetRanges(CCTK_ARGUMENTS) spacing[d] *= pow(cctkGH->cctk_convfac, cctkGH->cctk_convlevel); } - ierr = ConvertFromPhysicalBoundary - (3, physical_min, physical_max, interior_min, interior_max, - exterior_min, exterior_max, spacing); - if (ierr) - CCTK_WARN (0, "error returned from function ConvertFromPhysicalBoundary"); + if (CCTK_IsFunctionAliased ("MultiPatch_ConvertFromPhysicalBoundary")) { + ierr = MultiPatch_ConvertFromPhysicalBoundary + (map, 3, physical_min, physical_max, interior_min, interior_max, + exterior_min, exterior_max, spacing); + if (ierr) + CCTK_WARN (0, "error returned from function MultiPatch_ConvertFromPhysicalBoundary"); + } else { + ierr = ConvertFromPhysicalBoundary + (3, physical_min, physical_max, interior_min, interior_max, + exterior_min, exterior_max, spacing); + if (ierr) + CCTK_WARN (0, "error returned from function ConvertFromPhysicalBoundary"); + } for (d=0; d<3; ++d) { origin[d] = exterior_min[d]; -- cgit v1.2.3