diff options
Diffstat (limited to 'src/D3_to_D2.F')
| -rw-r--r-- | src/D3_to_D2.F | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/D3_to_D2.F b/src/D3_to_D2.F index bc684dc..2948517 100644 --- a/src/D3_to_D2.F +++ b/src/D3_to_D2.F @@ -177,17 +177,20 @@ c ------------------------------------------------------------ c Calculate radial derivatives and project onto sphere c ---------------------------------------------------- - CALL met_rad_der(origin,Dx,Dy,Dz,x,y,z,Psi,Extract_temp3d) - CALL CCTK_SyncGroup(ierror,cctkGH,"extract::temps") call CCTK_VarIndex(in_array_indices(1), "extract::temp3d") - call CCTK_InterpGV (ierror, cctkGH, interp_handle, coord_system_handle, - $ npoints, 1, 1, - $ xs, ys, zs, - $ CCTK_VARIABLE_REAL, CCTK_VARIABLE_REAL, - $ CCTK_VARIABLE_REAL, - $ in_array_indices(1), - $ dPsis, - $ CCTK_VARIABLE_REAL) + + if (conformal_state > 0) then + CALL met_rad_der(origin,Dx,Dy,Dz,x,y,z,Psi,Extract_temp3d) + CALL CCTK_SyncGroup(ierror,cctkGH,"extract::temps") + call CCTK_InterpGV (ierror, cctkGH, interp_handle, coord_system_handle, + $ npoints, 1, 1, + $ xs, ys, zs, + $ CCTK_VARIABLE_REAL, CCTK_VARIABLE_REAL, + $ CCTK_VARIABLE_REAL, + $ in_array_indices(1), + $ dPsis, + $ CCTK_VARIABLE_REAL) + end if CALL met_rad_der(origin,Dx,Dy,Dz,x,y,z,gxx,Extract_temp3d) CALL CCTK_SyncGroup(ierror,cctkGH,"extract::temps") @@ -261,7 +264,7 @@ c ----------------------------------- c Standard equation IF (do_ADMmass(1)) THEN CALL ADMmass_integrand3D(origin,Dx,Dy,Dz,x,y,z,gxx,gxy, - & gxz,gyy,gyz,gzz,Extract_temp3d,Psi,Psi_power) + & gxz,gyy,gyz,gzz,Extract_temp3d,Psi,Psi_power,conformal_state) CALL CCTK_SyncGroup(ierror,cctkGH,"extract::temps") call CCTK_InterpGV (ierror, cctkGH, interp_handle, coord_system_handle, $ npoints, 1, 1, |