diff options
author | schnetter <> | 2003-11-19 13:05:00 +0000 |
---|---|---|
committer | schnetter <> | 2003-11-19 13:05:00 +0000 |
commit | e0a09d0424661e8be3f4540937769a7f3b67a51e (patch) | |
tree | 13e77486af763cebdaf8d6666bbb2937358ba1c1 /CarpetDev | |
parent | e8cbc413df845d3bd569c803d23a896693b84f23 (diff) |
Only switch to global mode if not already in global mode.
darcs-hash:20031119130536-07bb3-7d6722ae739c4f3315fdfe85b3e0ac3dc899454e.gz
Diffstat (limited to 'CarpetDev')
-rw-r--r-- | CarpetDev/CarpetCG/src/CG.cc | 14 | ||||
-rw-r--r-- | CarpetDev/CarpetJacobi/src/Jacobi.cc | 14 |
2 files changed, 18 insertions, 10 deletions
diff --git a/CarpetDev/CarpetCG/src/CG.cc b/CarpetDev/CarpetCG/src/CG.cc index ea2a9f3d9..37f8d7cf9 100644 --- a/CarpetDev/CarpetCG/src/CG.cc +++ b/CarpetDev/CarpetCG/src/CG.cc @@ -1,4 +1,4 @@ -/* $Header: /home/eschnett/C/carpet/Carpet/CarpetDev/CarpetCG/src/CG.cc,v 1.1 2003/11/19 10:40:47 hawke Exp $ */ +/* $Header: /home/eschnett/C/carpet/Carpet/CarpetDev/CarpetCG/src/CG.cc,v 1.2 2003/11/19 14:05:36 schnetter Exp $ */ #include <cassert> #include <cmath> @@ -713,8 +713,10 @@ namespace CarpetCG { assert (reflevel==-1 || component==-1); const int saved_reflevel = reflevel; const int saved_mglevel = mglevel; - set_mglevel ((cGH *)cctkGH, -1); - set_reflevel ((cGH *)cctkGH, -1); + if (reflevel!=-1) { + set_mglevel ((cGH *)cctkGH, -1); + set_reflevel ((cGH *)cctkGH, -1); + } if (verbose || veryverbose) { @@ -1261,8 +1263,10 @@ namespace CarpetCG { free (common::nboundaryzones); // Restore state - set_reflevel ((cGH *)cctkGH, saved_reflevel); - set_mglevel ((cGH *)cctkGH, saved_mglevel); + if (reflevel!=saved_reflevel) { + set_reflevel ((cGH *)cctkGH, saved_reflevel); + set_mglevel ((cGH *)cctkGH, saved_mglevel); + } return 0; } diff --git a/CarpetDev/CarpetJacobi/src/Jacobi.cc b/CarpetDev/CarpetJacobi/src/Jacobi.cc index a4686af0a..ad673b342 100644 --- a/CarpetDev/CarpetJacobi/src/Jacobi.cc +++ b/CarpetDev/CarpetJacobi/src/Jacobi.cc @@ -1,4 +1,4 @@ -// $Header: /home/eschnett/C/carpet/Carpet/CarpetDev/CarpetJacobi/src/Jacobi.cc,v 1.1 2003/09/02 14:35:58 schnetter Exp $ +// $Header: /home/eschnett/C/carpet/Carpet/CarpetDev/CarpetJacobi/src/Jacobi.cc,v 1.2 2003/11/19 14:05:14 schnetter Exp $ #include <cassert> #include <cmath> @@ -329,8 +329,10 @@ namespace CarpetJacobi { assert (reflevel==-1 || component==-1); const int saved_reflevel = reflevel; const int saved_mglevel = mglevel; - set_mglevel ((cGH *)cctkGH, -1); - set_reflevel ((cGH *)cctkGH, -1); + if (reflevel!=-1) { + set_mglevel ((cGH *)cctkGH, -1); + set_reflevel ((cGH *)cctkGH, -1); + } // Fill common block common::var = var; @@ -509,8 +511,10 @@ namespace CarpetJacobi { done: // Restore state - set_reflevel ((cGH *)cctkGH, saved_reflevel); - set_mglevel ((cGH *)cctkGH, saved_mglevel); + if (reflevel!=saved_reflevel) { + set_reflevel ((cGH *)cctkGH, saved_reflevel); + set_mglevel ((cGH *)cctkGH, saved_mglevel); + } return ierr; } |