aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Carpet/Carpet/options/carpet-lilypond-ic20
-rw-r--r--Carpet/Carpet/src/Recompose.cc13
-rw-r--r--Carpet/CarpetIOASCII/src/ioascii.cc10
-rw-r--r--Carpet/CarpetLib/src/bboxset.hh8
-rw-r--r--Carpet/CarpetLib/src/defs.cc7
-rw-r--r--CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc10
-rw-r--r--CarpetAttic/Cart3dTest/README5
-rw-r--r--CarpetExtra/HydroToy/schedule.ccl4
-rw-r--r--CarpetExtra/IDHydroToy/schedule.ccl4
-rw-r--r--CarpetExtra/IDScalarWave/schedule.ccl4
-rw-r--r--CarpetExtra/IDSpaceTimeToy/schedule.ccl4
-rw-r--r--CarpetExtra/SpaceTimeToy/schedule.ccl4
-rw-r--r--CarpetExtra/WaveToyF77/schedule.ccl4
13 files changed, 58 insertions, 39 deletions
diff --git a/Carpet/Carpet/options/carpet-lilypond-ic b/Carpet/Carpet/options/carpet-lilypond-ic
index 1a751f3a1..8481385e8 100644
--- a/Carpet/Carpet/options/carpet-lilypond-ic
+++ b/Carpet/Carpet/options/carpet-lilypond-ic
@@ -1,4 +1,4 @@
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-lilypond-ic,v 1.1 2002/03/11 13:17:54 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-lilypond-ic,v 1.2 2002/04/29 11:27:52 schnetter Exp $
CPP = cpp -traditional -DTMPL_EXPLICIT -DCARPET_REAL
CC = icc
@@ -7,15 +7,15 @@ F77 = ifc
F90 = ifc
LD = icc
-LIBDIRS = /opt/intel/compiler50/ia32/lib /home/eschnett/proj/petsc-2.1.0/lib/libO/linux
-LIBS = mpich intrins IEPCF90 F90 imf m irc cxa cprts cxa
+LIBDIRS =
+LIBS = intrins IEPCF90 F90 imf m irc cxa cprts cxa
# basic
-CFLAGS = -restrict
-CXXFLAGS = -restrict
-F77FLAGS = -align -w95
-F90FLAGS = -align -w95
-LDFLAGS = -g -restrict -Qoption,ld,-rpath,/home/eschnett/proj/petsc-2.1.0/lib/libO/linux
+CFLAGS = -DTMPL_EXPLICIT -DCARPET_REAL -align -c99 -restrict
+CXXFLAGS = -DTMPL_EXPLICIT -DCARPET_REAL -align -c99 -restrict
+F90FLAGS = -DTMPL_EXPLICIT -DCARPET_REAL -align -c99 -restrict -w95
+F77FLAGS = -DTMPL_EXPLICIT -DCARPET_REAL -align -c99 -restrict -w95
+LDFLAGS = -DTMPL_EXPLICIT -DCARPET_REAL -align -c99 -restrict -g
# debugging
DEBUG = yes
@@ -26,8 +26,8 @@ F90_DEBUG_FLAGS = -g
# warnings
#WARN=yes
-C_WARN_FLAGS = -w1 # -w2
-CXX_WARN_FLAGS = -w1 # -w2
+C_WARN_FLAGS = -w1
+CXX_WARN_FLAGS = -w1
F77_WARN_FLAGS =
F90_WARN_FLAGS =
diff --git a/Carpet/Carpet/src/Recompose.cc b/Carpet/Carpet/src/Recompose.cc
index ee0a443a6..8088b719d 100644
--- a/Carpet/Carpet/src/Recompose.cc
+++ b/Carpet/Carpet/src/Recompose.cc
@@ -11,7 +11,7 @@
#include "cctk.h"
#include "cctk_Parameters.h"
-#include "CactusBase/IOUtil/src/ioutil_CheckpointRecovery.h"
+#include "CactusBase/IOUtil/src/ioGH.h"
#include "Carpet/CarpetLib/src/bbox.hh"
#include "Carpet/CarpetLib/src/bboxset.hh"
@@ -21,7 +21,7 @@
#include "carpet.hh"
-static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Recompose.cc,v 1.23 2002/03/26 13:22:27 schnetter Exp $";
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Recompose.cc,v 1.24 2002/04/29 11:27:54 schnetter Exp $";
CCTK_FILEVERSION(Carpet_Recompose_cc)
@@ -329,6 +329,13 @@ namespace Carpet {
// Output only if output is desired
if (strcmp(grid_structure_filename, "") == 0) return;
+ // Get grid hierarchy extentsion from IOUtil
+ const ioGH * const iogh = (const ioGH *)CCTK_GHExtension (cgh, "IO");
+ assert (iogh);
+
+ // Create the output directory
+ CCTK_CreateDirectory (0755, outdir);
+
ofstream file;
char filename[1000];
snprintf (filename, sizeof(filename), "%s/%s",
@@ -339,7 +346,7 @@ namespace Carpet {
if (do_truncate) {
do_truncate = false;
struct stat fileinfo;
- if (! IOUtil_RestartFromRecovery(cgh)
+ if (! iogh->recovered
|| stat(filename, &fileinfo)!=0) {
file.open (filename, ios::out | ios::trunc);
assert (file.good());
diff --git a/Carpet/CarpetIOASCII/src/ioascii.cc b/Carpet/CarpetIOASCII/src/ioascii.cc
index 03d427da1..7b4f106ab 100644
--- a/Carpet/CarpetIOASCII/src/ioascii.cc
+++ b/Carpet/CarpetIOASCII/src/ioascii.cc
@@ -15,7 +15,7 @@
#include "cctk.h"
#include "cctk_Parameters.h"
-#include "CactusBase/IOUtil/src/ioutil_CheckpointRecovery.h"
+#include "CactusBase/IOUtil/src/ioGH.h"
#include "Carpet/CarpetLib/src/data.hh"
#include "Carpet/CarpetLib/src/dist.hh"
@@ -28,7 +28,7 @@
#include "ioascii.hh"
-static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.cc,v 1.30 2002/03/26 13:22:28 schnetter Exp $";
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.cc,v 1.31 2002/04/29 11:27:56 schnetter Exp $";
CCTK_FILEVERSION(CarpetIOASCII_ioascii_cc)
@@ -171,6 +171,10 @@ int CarpetIOASCII<outdim>
return 0;
}
+ // Get grid hierarchy extentsion from IOUtil
+ const ioGH * const iogh = (const ioGH *)CCTK_GHExtension (cgh, "IO");
+ assert (iogh);
+
// Create the output directory
const char* myoutdir = GetStringParameter("outdir%dD", outdir);
if (CCTK_MyProc(cgh)==0) {
@@ -254,7 +258,7 @@ int CarpetIOASCII<outdim>
// the root processor
if (do_truncate[n]) {
struct stat fileinfo;
- if (! IOUtil_RestartFromRecovery(cgh)
+ if (! iogh->recovered
|| stat(filename, &fileinfo)!=0) {
file.open (filename, ios::out | ios::trunc);
assert (file.good());
diff --git a/Carpet/CarpetLib/src/bboxset.hh b/Carpet/CarpetLib/src/bboxset.hh
index 500f5821e..5e3cf16b2 100644
--- a/Carpet/CarpetLib/src/bboxset.hh
+++ b/Carpet/CarpetLib/src/bboxset.hh
@@ -5,7 +5,7 @@
copyright : (C) 2000 by Erik Schnetter
email : schnetter@astro.psu.edu
- $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/bboxset.hh,v 1.6 2001/12/14 16:39:41 schnetter Exp $
+ $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/bboxset.hh,v 1.7 2002/04/29 11:27:59 schnetter Exp $
***************************************************************************/
@@ -128,8 +128,10 @@ public:
typedef typename bset::const_iterator const_iterator;
typedef typename bset::iterator iterator;
- iterator begin () const { return bs.begin(); }
- iterator end () const { return bs.end(); }
+ const_iterator begin () const { return bs.begin(); }
+ const_iterator end () const { return bs.end(); }
+// iterator begin () const { return bs.begin(); }
+// iterator end () const { return bs.end(); }
// Output
void output (ostream& os) const;
diff --git a/Carpet/CarpetLib/src/defs.cc b/Carpet/CarpetLib/src/defs.cc
index 5a913beb0..7cf49f92a 100644
--- a/Carpet/CarpetLib/src/defs.cc
+++ b/Carpet/CarpetLib/src/defs.cc
@@ -5,7 +5,7 @@
copyright : (C) 2000 by Erik Schnetter
email : schnetter@astro.psu.edu
- $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/defs.cc,v 1.9 2002/03/11 13:17:12 schnetter Exp $
+ $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/defs.cc,v 1.10 2002/04/29 11:27:59 schnetter Exp $
***************************************************************************/
@@ -51,8 +51,9 @@ istream& input (istream& is, vector<T>& v) {
is.get();
skipws (is);
while (is.good() && is.peek() != ']') {
- v.push_back ();
- is >> v[v.size()-1];
+ T elem;
+ is >> elem;
+ v.push_back (elem);
skipws (is);
if (is.peek() != ',') break;
is.get();
diff --git a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
index 8d564964c..bab0d81ad 100644
--- a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
+++ b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
@@ -21,7 +21,7 @@
#include "cctk.h"
#include "cctk_Parameters.h"
-#include "CactusBase/IOUtil/src/ioutil_CheckpointRecovery.h"
+#include "CactusBase/IOUtil/src/ioGH.h"
#include "Carpet/CarpetLib/src/bbox.hh"
#include "Carpet/CarpetLib/src/data.hh"
@@ -33,7 +33,7 @@
#include "ioflexio.hh"
-static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc,v 1.16 2002/03/26 13:22:29 schnetter Exp $";
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc,v 1.17 2002/04/29 11:27:57 schnetter Exp $";
CCTK_FILEVERSION(CarpetIOFlexIO_ioflexio_cc)
@@ -136,6 +136,10 @@ namespace CarpetIOFlexIO {
return 0;
}
+ // Get grid hierarchy extentsion from IOUtil
+ const ioGH * const iogh = (const ioGH *)CCTK_GHExtension (cgh, "IO");
+ assert (iogh);
+
// Create the output directory
const char* myoutdir = GetStringParameter("outdir3D", outdir);
if (CCTK_MyProc(cgh)==0) {
@@ -171,7 +175,7 @@ namespace CarpetIOFlexIO {
// If this is the first time, then create and truncate the file
if (do_truncate[n]) {
struct stat fileinfo;
- if (! IOUtil_RestartFromRecovery(cgh)
+ if (! iogh->recovered
|| stat(filename, &fileinfo)!=0) {
writer = 0;
if (CCTK_Equals(out3D_format, "IEEE")) {
diff --git a/CarpetAttic/Cart3dTest/README b/CarpetAttic/Cart3dTest/README
index 1cd89293d..5fcc111c8 100644
--- a/CarpetAttic/Cart3dTest/README
+++ b/CarpetAttic/Cart3dTest/README
@@ -1,7 +1,8 @@
Cactus Code Thorn Cart3dTest
-Authors : ...
-CVS info : $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/Cart3dTest/README,v 1.1 2001/03/01 15:49:27 eschnett Exp $
+Authors : Erik Schnetter <schnetter@uni-tuebingen.de>
+CVS info : $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/Cart3dTest/README,v 1.2 2002/04/29 11:28:00 schnetter Exp $
--------------------------------------------------------------------------
Purpose of the thorn:
+Test certain internals of Carpet.
diff --git a/CarpetExtra/HydroToy/schedule.ccl b/CarpetExtra/HydroToy/schedule.ccl
index aa8716cb0..29d27ecc2 100644
--- a/CarpetExtra/HydroToy/schedule.ccl
+++ b/CarpetExtra/HydroToy/schedule.ccl
@@ -1,11 +1,11 @@
# Schedule definitions for thorn HydroToy
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/schedule.ccl,v 1.2 2001/08/26 13:59:40 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/schedule.ccl,v 1.3 2002/04/29 11:28:01 schnetter Exp $
if (hydrotoy_active) {
-STORAGE: hydroevolve
+STORAGE: hydroevolve[3]
diff --git a/CarpetExtra/IDHydroToy/schedule.ccl b/CarpetExtra/IDHydroToy/schedule.ccl
index 66e867f91..febd956ec 100644
--- a/CarpetExtra/IDHydroToy/schedule.ccl
+++ b/CarpetExtra/IDHydroToy/schedule.ccl
@@ -1,5 +1,5 @@
# Schedule definitions for thorn IDHydroToy
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/schedule.ccl,v 1.1 2001/03/18 22:37:10 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/schedule.ccl,v 1.2 2002/04/29 11:28:02 schnetter Exp $
schedule IDHydroToy_Startup at STARTUP
{
@@ -9,5 +9,5 @@ schedule IDHydroToy_Startup at STARTUP
schedule IDHydroToy_InitialData as HydroToy_InitialData at INITIAL
{
LANG: Fortran
- STORAGE: hydrotoy::hydroevolve
+ STORAGE: hydrotoy::hydroevolve[3]
} "Initial data for 3D wave equation"
diff --git a/CarpetExtra/IDScalarWave/schedule.ccl b/CarpetExtra/IDScalarWave/schedule.ccl
index cc46e3ece..ee249fff2 100644
--- a/CarpetExtra/IDScalarWave/schedule.ccl
+++ b/CarpetExtra/IDScalarWave/schedule.ccl
@@ -1,5 +1,5 @@
# Schedule definitions for thorn IDScalarWave
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWave/schedule.ccl,v 1.3 2001/12/14 18:00:00 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWave/schedule.ccl,v 1.4 2002/04/29 11:28:03 schnetter Exp $
schedule IDScalarWave_CheckParameters at PARAMCHECK
{
@@ -8,6 +8,6 @@ schedule IDScalarWave_CheckParameters at PARAMCHECK
schedule IDScalarWave_InitialData as WaveToy_InitialData at INITIAL
{
- STORAGE: wavetoy::scalarevolve
+ STORAGE: wavetoy::scalarevolve[3]
LANG: Fortran
} "Initial data for 3D wave equation"
diff --git a/CarpetExtra/IDSpaceTimeToy/schedule.ccl b/CarpetExtra/IDSpaceTimeToy/schedule.ccl
index 6a852d30b..c959aaf11 100644
--- a/CarpetExtra/IDSpaceTimeToy/schedule.ccl
+++ b/CarpetExtra/IDSpaceTimeToy/schedule.ccl
@@ -1,5 +1,5 @@
# Schedule definitions for thorn IDSpaceTimeToy
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDSpaceTimeToy/schedule.ccl,v 1.3 2001/03/20 17:27:26 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDSpaceTimeToy/schedule.ccl,v 1.4 2002/04/29 11:28:05 schnetter Exp $
schedule IDSpaceTimeToy_Startup at STARTUP
{
@@ -10,5 +10,5 @@ schedule IDSpaceTimeToy_InitialData as SpaceTimeToy_InitialData at INITIAL \
after IDHydroToy_InitialData
{
LANG: Fortran
- STORAGE: spacetimetoy::spacetimeevolve
+ STORAGE: spacetimetoy::spacetimeevolve[3]
} "Initial data for 3D wave equation"
diff --git a/CarpetExtra/SpaceTimeToy/schedule.ccl b/CarpetExtra/SpaceTimeToy/schedule.ccl
index af4820e8b..3b1230e77 100644
--- a/CarpetExtra/SpaceTimeToy/schedule.ccl
+++ b/CarpetExtra/SpaceTimeToy/schedule.ccl
@@ -1,7 +1,7 @@
# Schedule definitions for thorn SpaceTimeToy
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/schedule.ccl,v 1.4 2001/03/20 17:27:26 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/schedule.ccl,v 1.5 2002/04/29 11:28:06 schnetter Exp $
-STORAGE: spacetimeevolve
+STORAGE: spacetimeevolve[3]
STORAGE: icn_state
diff --git a/CarpetExtra/WaveToyF77/schedule.ccl b/CarpetExtra/WaveToyF77/schedule.ccl
index 6517c55ee..cab2e59ef 100644
--- a/CarpetExtra/WaveToyF77/schedule.ccl
+++ b/CarpetExtra/WaveToyF77/schedule.ccl
@@ -1,7 +1,7 @@
# Schedule definitions for thorn WaveToy77
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/schedule.ccl,v 1.4 2001/03/26 02:29:33 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/schedule.ccl,v 1.5 2002/04/29 11:28:07 schnetter Exp $
-STORAGE: scalarevolve
+STORAGE: scalarevolve[3]
schedule WaveToyF77_Startup at STARTUP
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 16:53:50 +0000