diff options
| author | allen <allen@a678b1cf-93e1-4b43-a69d-d43939e66649> | 2002-05-10 05:16:48 +0000 |
|---|---|---|
| committer | allen <allen@a678b1cf-93e1-4b43-a69d-d43939e66649> | 2002-05-10 05:16:48 +0000 |
| commit | 808a8b886a5484d9d82584d0c6a042f7a50b03ec (patch) | |
| tree | b9f749a97c6096e9837d5c05bfdc1d24c29e4011 | |
| parent | bafe387ca10919f02c1f110ff2f377a272852639 (diff) | |
tweaks to conformal choices
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/IDBrillData/trunk@71 a678b1cf-93e1-4b43-a69d-d43939e66649
| -rw-r--r-- | src/setupbrilldata3D.F | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/setupbrilldata3D.F b/src/setupbrilldata3D.F index 5a20e21..9daa65f 100644 --- a/src/setupbrilldata3D.F +++ b/src/setupbrilldata3D.F @@ -40,8 +40,8 @@ c c \ z rho phi phi / DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS + DECLARE_CCTK_FUNCTIONS - integer CCTK_Equals integer i,j,k integer nx,ny,nz integer ierr @@ -87,8 +87,8 @@ c Set up conformal metric. do j=1,ny do i=1,nx psi(i,j,k) = one - if (CCTK_Equals(conformal_storage,"factor").ne.1) then -c (.not. CCTK_EQUALS gives a parse error, I have no idea why) + if (CCTK_EQUALS(conformal_storage,"factor+derivs") .or. + & CCTK_EQUALS(conformal_storage,"factor+derivs+2nd derivs")) then psix(i,j,k) = zero psiy(i,j,k) = zero psiz(i,j,k) = zero @@ -101,16 +101,12 @@ c (.not. CCTK_EQUALS gives a parse error, I have no idea why) psixy(i,j,k) = zero psixz(i,j,k) = zero psiyz(i,j,k) = zero - conformal_state=3 + conformal_state = 3 end if end do end do end do - else - -c conformal_state = 0 -- metric_type "physical" does not allocate storage for conformal_state! - end if |