Enough changes to get planewaves to run!

NOTE: The parameters are still messed up both this is a known, and possibley
fixed problem.


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/IDLinearWaves/trunk@10 5c0f84ea-6048-4d6e-bfa4-55cd5f2e0dd7

5 files changed, 55 insertions, 65 deletions

diff --git a/param.ccl b/param.ccl
index 5a8b69f..96990c8 100644
--- a/param.ccl
+++ b/param.ccl
@@ -4,7 +4,7 @@ friend:einstein
 
 EXTENDS KEYWORD initial_data ""
 "teukwaves" :: "linear waves initialdata: Teukolsky waves"
-"planewave" :: "linear waves initialdata: plane waves"
+"planewaves" :: "linear waves initialdata: plane waves"
 }
 
 private:
diff --git a/schedule.ccl b/schedule.ccl
index f7b878f..5c536b2 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -1,9 +1,18 @@
 # Schedule definitions for thorn IDLinearWaves
 
-if (CCTK_Equals(initial_data,"linearwaves")) 
+if (CCTK_Equals(initial_data,"planewaves")) 
 {
-  schedule LinearWaves at CCTK_INITIAL
+  schedule planewaves at CCTK_INITIAL
   {
     LANG: Fortran
-  } "Construct linear wave initial data"  
+  } "Construct linear planewave initial data"  
 }
+
+if (CCTK_Equals(initial_data,"teukwaves")) 
+{
+  schedule teukwaves at CCTK_INITIAL
+  {
+    LANG: Fortran
+  } "Construct linear Teukolsky wave initial data"  
+}
+
diff --git a/src/LinearWaves.F b/src/LinearWaves.F
deleted file mode 100644
index c15a196..0000000
--- a/src/LinearWaves.F
+++ /dev/null
@@ -1,61 +0,0 @@
-c/*@@
-c  @file      linearWaves.F
-c  @date      
-c  @author    Joan Masso
-c  @desc 
-c             Driver for the analytical (or almost) linear wave models 
-c  @enddesc 
-c@@*/
-
-c/*@@
-c  @routine    linearWaves
-c  @date       
-c  @author     Joan Masso 
-c  @desc 
-c  
-c  @enddesc 
-c  @calls     planewaves teukwaves
-c  @calledby   
-c  @history Converted to Cactus4.0. the code and its comments of the
-   original authors are kept. There is NO BM support at this point.
-   Id like to know how Cactus handles this w/o #ifdef !
-c
-c  @endhistory 
-c@@*/
-
-#include "cctk.h"
-#include "declare_arguments.h"
-#include "declare_parameters.h"
-
-      subroutine linearWaves(CCTK_FARGUMENTS)
-
-      implicit none
-      
-      DECLARE_CCTK_FARGUMENTS
-      DECLARE_PARAMETERS
-
-      integer CCTK_Equals
-
-c     Call the Teukolsky wave init routine
-      if (CCTK_Equals(initial_data,'teukwaves').eq.1) then
-
-         call teukwaves(CCTK_FARGUMENTS)
-
-c     at this point CACTUS 3.2.0 has the following calls
-c     #ifdef BMUTIL call metricderiv
-c     #ifdef BONAMASSO: vxyz=0; call vectorini;
-
-      elseif (CCTK_Equals(initial_data,'planewaves') == 1) then
-
-         call planewaves(CCTK_FARGUMENTS)
-
-c     at this point CACTUS 3.2.0 has the following calls     
-c     #ifdef BMUTIL call vectorini;
-
-      else 
-
-         call CCTK_Warn(0,"Thorn linearWaves: model initialization failed");
-      endif
-      
-      return
-      end
diff --git a/src/planewaves.F b/src/planewaves.F
index 683de4c..feba82d 100644
--- a/src/planewaves.F
+++ b/src/planewaves.F
@@ -37,6 +37,9 @@
 #include "cctk.h"
 #include "declare_arguments.h"
 #include "declare_parameters.h"
+c Using macro definitions from Einstein
+#include "../../packages/CactusEinstein/Einstein/src/Einstein.h"
+
 
       subroutine planewaves(CCTK_FARGUMENTS)
       implicit none
@@ -215,6 +218,24 @@ c     loop over sh ends here:
           enddo 
         enddo
       enddo
+
+c     initialize the conformal factor
+      if (use_conformal == 1) then
+         conformal_state = CONFORMAL_METRIC
+         psi   = 1d0
+         psix  = 0d0
+         psiy  = 0d0
+         psiz  = 0d0    
+         psixy = 0d0
+         psixz = 0d0
+         psiyz = 0d0  
+         psixx = 0d0
+         psiyy = 0d0
+         psizz = 0d0
+      else
+         conformal_state = NOCONFORMAL_METRIC
+      end if
+
       
       return
       end
diff --git a/src/teukwaves.F b/src/teukwaves.F
index a2f1ca4..50cbd36 100644
--- a/src/teukwaves.F
+++ b/src/teukwaves.F
@@ -1,6 +1,9 @@
 #include "cctk.h"
 #include "declare_arguments.h"
 #include "declare_parameters.h"
+c Using macro definitions from Einstein
+#include "../../packages/CactusEinstein/Einstein/src/Einstein.h"
+
 
 /*@@
   @file     teukwaves.F
@@ -563,6 +566,24 @@ c     time symmetry
             enddo
          enddo
       enddo
+
+c     initialize the conformal factor
+      if (use_conformal == 1) then
+         conformal_state = CONFORMAL_METRIC
+         psi   = 1d0
+         psix  = 0d0
+         psiy  = 0d0
+         psiz  = 0d0    
+         psixy = 0d0
+         psixz = 0d0
+         psiyz = 0d0  
+         psixx = 0d0
+         psiyy = 0d0
+         psizz = 0d0
+      else
+         conformal_state = NOCONFORMAL_METRIC
+      end if
+
       
       return
       end