From a21b899e4f32882635fb5cf58bfb4d36b055d0cf Mon Sep 17 00:00:00 2001
From: allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac>
Date: Tue, 20 Jun 2000 09:10:51 +0000
Subject: Using ParameterGet

git-svn-id: http://svn.cactuscode.org/flesh/trunk@1684 17b73243-c579-4c4c-a9d2-2d5706c11dac
---
 src/main/Banner.c                  | 12 +++++++-----
 src/main/CactusDefaultEvolve.c     | 19 ++++++++++++++-----
 src/main/CactusDefaultInitialise.c | 15 +++++++--------
 src/main/SetupCache.c              | 17 ++++++++++++-----
 src/main/Startup.c                 |  2 --
 5 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/src/main/Banner.c b/src/main/Banner.c
index b8574e02..08c98d08 100644
--- a/src/main/Banner.c
+++ b/src/main/Banner.c
@@ -13,11 +13,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "cctk_Banner.h"
 #include "cctk_Config.h"
 #include "cctk_Flesh.h"
-#include "cctk_Parameters.h"
-#include "cctk_Banner.h"
 #include "cctk_FortranString.h"
+#include "cctk_Parameter.h"
 
 static char *rcsid = "$Header$";
 
@@ -156,10 +156,12 @@ void  CCTK_FCALL CCTK_FNAME(CCTK_RegisterBanner)
 
 int CCTKi_PrintBanners(void)
 {
-
-  DECLARE_CCTK_PARAMETERS
-
   int i;
+  int param_type;
+  int cctk_show_banners;
+
+  cctk_show_banners = (*(int *)CCTK_ParameterGet("cctk_show_banners",
+						 "Cactus",&param_type));
 
   if (cctk_show_banners)
   {
diff --git a/src/main/CactusDefaultEvolve.c b/src/main/CactusDefaultEvolve.c
index 26552dc6..056549b8 100644
--- a/src/main/CactusDefaultEvolve.c
+++ b/src/main/CactusDefaultEvolve.c
@@ -13,7 +13,7 @@
 #include <stdio.h>
 
 #include "cctk_Flesh.h"
-#include "cctk_Parameters.h"
+#include "cctk_Parameter.h"
 
 #include "CactusIOFunctions.h"
 
@@ -124,8 +124,8 @@ int CactusDefaultEvolve(tFleshConfig *config)
   /*** a Traverse with CCTK_ANALYSIS      ***/
   ForallConvLevels(iteration, convergence_level)
   {
-      CCTK_Traverse(config->GH[convergence_level], "CCTK_ANALYSIS");
-      CCTK_OutputGH(config->GH[convergence_level]);
+    CCTK_Traverse(config->GH[convergence_level], "CCTK_ANALYSIS");
+    CCTK_OutputGH(config->GH[convergence_level]);
   }
   EndForallConvLevels;
 
@@ -224,7 +224,17 @@ int CactusDefaultEvolve(tFleshConfig *config)
 @@*/
 static int DoneMainLoop (CCTK_REAL cctk_time, int iteration)
 {
-  DECLARE_CCTK_PARAMETERS
+  int param_type;
+  CCTK_INT  cctk_itlast;
+  CCTK_REAL cctk_initial_time;
+  CCTK_REAL cctk_final_time;
+
+  cctk_initial_time = (*(CCTK_REAL *)CCTK_ParameterGet("cctk_initial_time",
+						       "Cactus",&param_type));
+  cctk_final_time   = (*(CCTK_REAL *)CCTK_ParameterGet("cctk_final_time",
+						       "Cactus",&param_type));
+  cctk_itlast       = (*(CCTK_INT *)CCTK_ParameterGet("cctk_itlast",
+						      "Cactus",&param_type));
 
   return (! (iteration < cctk_itlast ||
             (cctk_final_time > cctk_initial_time ?
@@ -255,7 +265,6 @@ static int StepGH(cGH *GH)
   CCTK_Traverse(GH, "CCTK_PRESTEP");
   CCTK_Traverse(GH, "CCTK_EVOL");
 
-
   /* Advance GH->time AFTER evolving */
 
   GH->cctk_time = GH->cctk_time + GH->cctk_delta_time;
diff --git a/src/main/CactusDefaultInitialise.c b/src/main/CactusDefaultInitialise.c
index 90a12fa3..1c2d5db8 100644
--- a/src/main/CactusDefaultInitialise.c
+++ b/src/main/CactusDefaultInitialise.c
@@ -12,10 +12,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "cctk_Bindings.h"
 #include "cctk_Flesh.h"
 #include "cctk_GHExtensions.h"
-#include "cctk_Bindings.h"
-#include "cctk_Parameters.h"
+#include "cctk_Parameter.h"
+
 #include "cctki_ScheduleBindings.h"
 #include "cctki_GHExtensions.h"
 #include "cctki_WarnLevel.h"
@@ -91,14 +92,12 @@ int CactusDefaultInitialise(tFleshConfig *config)
 @@*/
 int CactusInitialiseGH(cGH *GH)
 {
-  
-  DECLARE_CCTK_PARAMETERS
+  int param_type;
+  CCTK_REAL cctk_initial_time;
 
+  cctk_initial_time = (*(CCTK_REAL *)CCTK_ParameterGet("cctk_initial_time",
+						       "Cactus",&param_type));
 
-  /*
-  SetupFortranArrays(GH);
-  */
-  
   /* Initialise time */
   GH->cctk_time = cctk_initial_time;
 
diff --git a/src/main/SetupCache.c b/src/main/SetupCache.c
index 0d061b88..f99a2254 100644
--- a/src/main/SetupCache.c
+++ b/src/main/SetupCache.c
@@ -11,8 +11,9 @@
 
 #include "cctk_Config.h"
 #include "cctk_Flesh.h"
+#include "cctk_Parameter.h"
+
 #include "cctki_Cache.h"
-#include "cctk_Parameters.h"
 
 static char *rcsid = "$Header$";
 
@@ -43,16 +44,22 @@ CCTK_FILEVERSION(main_SetupCache_c)
 @@*/
 int CCTKi_SetupCache(void)
 {
-  DECLARE_CCTK_PARAMETERS
+  int param_type;
+  int manual_cache_setup;
 
   unsigned long cache_size;
   unsigned long cacheline_bytes;
 
+  manual_cache_setup = (*(int *)CCTK_ParameterGet("manual_cache_setup",
+						  "Cactus",&param_type));
+
   if(manual_cache_setup)
   {
-    cache_size = manual_cache_size;
-    cacheline_bytes = manual_cacheline_bytes;
-  }
+    cache_size = (*(int *)CCTK_ParameterGet("manual_cache_size",
+					    "Cactus",&param_type));
+    cacheline_bytes = (*(int *)CCTK_ParameterGet("manual_cacheline_bytes",
+						 "Cactus",&param_type));
+  } 
   else
   {
     /* FIXME:  Remove this check for release */
diff --git a/src/main/Startup.c b/src/main/Startup.c
index a7900de7..a12623a2 100644
--- a/src/main/Startup.c
+++ b/src/main/Startup.c
@@ -31,10 +31,8 @@ int CactusStartup(void)
 
 #define B_ANNERLINE B_1 "\n" B_2 "\n" B_3 "\n" B_4 "\n" B_5 "\n" B_6 "\n" B_7 "\n" B_8 "\n" B_9 "\n"
  
-
   string = B_ANNERLINE;
 
-
   CCTK_RegisterBanner(string);
   
   return 0;
-- 
cgit v1.2.3