Now compiles.

Tom


git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGH/PUGH/trunk@3 b61c5cb5-eaca-4651-9a7a-d64986f99364

1 files changed, 28 insertions, 4 deletions

diff --git a/param.ccl b/param.ccl
index 6dcb5d7..1575be5 100644
--- a/param.ccl
+++ b/param.ccl
@@ -1,21 +1,21 @@
 # Parameter definitions for thorn pugh
 # $Header$
 
-public:
+protected:
 
-INTEGER nx "The size of the grid in the x direction"
+INTEGER global_nx "The size of the grid in the x direction"
 {
     *:-1    :: "Fixed size of minus this per processor"
     1:*     :: "Grid of this size distributed across all processors"
 } 10
 
-INTEGER ny "The size of the grid in the y direction"
+INTEGER global_ny "The size of the grid in the y direction"
 {
     *:-1    :: "Fixed size of minus this per processor"
     1:*     :: "Grid of this size distributed across all processors"
 } 10
 
-INTEGER nz "The size of the grid in the z direction"
+INTEGER global_nz "The size of the grid in the z direction"
 {
     *:-1    :: "Fixed size of minus this per processor"
     1:*     :: "Grid of this size distributed across all processors"
@@ -25,3 +25,27 @@ INTEGER ghost_size "The width of the ghost zone"
 {
     1:*     :: "Must be a positive integer"
 } 1
+
+private:
+
+KEYWORD proc_topology "How to determine the processor topology"
+{
+  "manual"    :: "Specified by proc_top_nx etc"
+  "automatic" :: "Automatically generated"
+} "automatic"
+
+
+INTEGER proc_top_nx "No of Procs in X direction"
+{
+  0:*  :: "See proc_topology"
+} 0
+
+INTEGER proc_top_ny "No of Procs in Y direction"
+{
+  0:*  :: "See proc_topology"
+} 0
+
+INTEGER proc_top_nz "No of Procs in Z direction"
+{
+  0:*  :: "See proc_topology"
+} 0