[Commits] [svn:einsteintoolkit] GRHydro/branches/ET_2013_05/src/ (Rev. 521)
rhaas at tapir.caltech.edu
rhaas at tapir.caltech.edu
Thu May 16 22:43:54 CDT 2013
User: rhaas
Date: 2013/05/16 10:43 PM
Added:
/branches/ET_2013_05/src/
Con2PrimM_fortran_interfaces.F90, Con2Prim_fortran_interfaces.F90
Modified:
/branches/ET_2013_05/src/
GRHydro_Con2Prim.F90, GRHydro_Con2PrimAM.F90, GRHydro_Con2PrimM.F90, GRHydro_Interfaces.h, GRHydro_InterfacesAM.h, GRHydro_InterfacesM.h, make.code.defn
Log:
GRHydro: replace C-style include for module with proper module
the C-like coding had some problems, in particular it would compile the same
module more than once and would circumvent Cactus' module dependency tracking.
File Changes:
Directory: /branches/ET_2013_05/src/
====================================
File [added]: Con2PrimM_fortran_interfaces.F90
Delta lines: +97 -0
===================================================================
--- branches/ET_2013_05/src/Con2PrimM_fortran_interfaces.F90 (rev 0)
+++ branches/ET_2013_05/src/Con2PrimM_fortran_interfaces.F90 2013-05-17 03:43:54 UTC (rev 521)
@@ -0,0 +1,97 @@
+#include "cctk.h"
+
+module Con2PrimM_fortran_interfaces
+ implicit none
+
+ interface
+
+ subroutine GRHydro_Con2PrimM_pt( handle, keytemp, prec, &
+ local_gam, dens, &
+ sx, sy, sz, &
+ tau, &
+ Bconsx, Bconsy, Bconsz, &
+ xye, xtemp, &
+ rho, &
+ velx, vely, velz,&
+ epsilon, pressure,&
+ Bx, By, Bz, &
+ bsq,&
+ w_lorentz, &
+ gxx, gxy, gxz, &
+ gyy, gyz, gzz, &
+ uxx, uxy, uxz,&
+ uyy, uyz, uzz,&
+ det,&
+ epsnegative, &
+ retval)
+
+ implicit none
+ CCTK_INT handle
+ CCTK_INT keytemp
+ CCTK_REAL prec
+ CCTK_REAL local_gam
+ CCTK_REAL dens
+ CCTK_REAL sx, sy, sz
+ CCTK_REAL tau
+ CCTK_REAL Bconsx, Bconsy, Bconsz
+ CCTK_REAL xye
+ CCTK_REAL xtemp
+ CCTK_REAL rho
+ CCTK_REAL velx, vely, velz
+ CCTK_REAL epsilon, pressure
+ CCTK_REAL Bx, By, Bz
+ CCTK_REAL bsq
+ CCTK_REAL w_lorentz
+ CCTK_REAL gxx, gxy, gxz
+ CCTK_REAL gyy, gyz, gzz
+ CCTK_REAL uxx, uxy, uxz
+ CCTK_REAL uyy, uyz, uzz
+ CCTK_REAL det
+ CCTK_INT epsnegative
+ CCTK_REAL retval
+ end subroutine GRHydro_Con2PrimM_pt
+
+ subroutine GRHydro_Con2PrimM_Polytype_pt( handle, local_gam,&
+ dens, &
+ sx, sy, sz, &
+ sc, &
+ Bconsx, Bconsy, Bconsz, &
+ rho, &
+ velx, vely, velz,&
+ epsilon, pressure,&
+ Bx, By, Bz, &
+ bsq,&
+ w_lorentz, &
+ gxx, gxy, gxz, &
+ gyy, gyz, gzz, &
+ uxx, uxy, uxz,&
+ uyy, uyz, uzz,&
+ det,&
+ epsnegative, &
+ retval)
+
+ implicit none
+ CCTK_INT handle
+ CCTK_REAL local_gam
+ CCTK_REAL dens
+ CCTK_REAL sx, sy, sz
+ CCTK_REAL sc
+ CCTK_REAL Bconsx, Bconsy, Bconsz
+ CCTK_REAL rho
+ CCTK_REAL velx, vely, velz
+ CCTK_REAL epsilon, pressure
+ CCTK_REAL Bx, By, Bz
+ CCTK_REAL bsq
+ CCTK_REAL w_lorentz
+ CCTK_REAL gxx, gxy, gxz
+ CCTK_REAL gyy, gyz, gzz
+ CCTK_REAL uxx, uxy, uxz
+ CCTK_REAL uyy, uyz, uzz
+ CCTK_REAL det
+ CCTK_INT epsnegative
+ CCTK_REAL retval
+ end subroutine GRHydro_Con2PrimM_Polytype_pt
+
+ end interface
+
+end module Con2PrimM_fortran_interfaces
File [added]: Con2Prim_fortran_interfaces.F90
Delta lines: +87 -0
===================================================================
--- branches/ET_2013_05/src/Con2Prim_fortran_interfaces.F90 (rev 0)
+++ branches/ET_2013_05/src/Con2Prim_fortran_interfaces.F90 2013-05-17 03:43:54 UTC (rev 521)
@@ -0,0 +1,87 @@
+#include "cctk.h"
+
+module Con2Prim_fortran_interfaces
+ implicit none
+
+ interface
+
+ subroutine Con2Prim_pt(handle, &
+ dens, &
+ sx, sy, sz, &
+ tau, &
+ rho, &
+ velx, vely, velz, &
+ epsilon, press, &
+ w_lorentz, &
+ uxx, uxy, uxz, &
+ uyy, uyz, uzz, &
+ det, &
+ x, y, z, r, &
+ epsnegative, &
+ GRHydro_rho_min, pmin, epsmin, &
+ GRHydro_reflevel, GRHydro_C2P_failed)
+
+ implicit none
+ CCTK_INT handle
+ CCTK_REAL dens
+ CCTK_REAL sx, sy, sz
+ CCTK_REAL tau
+ CCTK_REAL rho
+ CCTK_REAL velx, vely, velz
+ CCTK_REAL epsilon, press
+ CCTK_REAL w_lorentz
+ CCTK_REAL uxx, uxy, uxz
+ CCTK_REAL uyy, uyz, uzz
+ CCTK_REAL det
+ CCTK_REAL x, y, z, r
+ logical epsnegative
+ CCTK_REAL GRHydro_rho_min, pmin, epsmin
+ CCTK_INT GRHydro_reflevel
+ CCTK_REAL GRHydro_C2P_failed
+ end subroutine Con2Prim_pt
+
+ subroutine Con2Prim_ptPolytype(GRHydro_polytrope_handle, &
+ dens, &
+ sx, sy, sz, &
+ tau, &
+ rho, &
+ velx, vely, velz, &
+ eps, press, &
+ w_lorentz, &
+ uxx, uxy, uxz, uyy, uyz, uzz, &
+ det, &
+ x, y, z, r, &
+ GRHydro_rho_min, &
+ GRHydro_reflevel, GRHydro_C2P_failed)
+
+ implicit none
+ CCTK_INT GRHydro_polytrope_handle
+ CCTK_REAL dens
+ CCTK_REAL sx, sy, sz
+ CCTK_REAL tau
+ CCTK_REAL rho
+ CCTK_REAL velx, vely, velz
+ CCTK_REAL eps, press
+ CCTK_REAL w_lorentz
+ CCTK_REAL uxx, uxy, uxz
+ CCTK_REAL uyy, uyz, uzz
+ CCTK_REAL det
+ CCTK_REAL x, y, z, r
+ CCTK_REAL GRHydro_rho_min
+ CCTK_INT GRHydro_reflevel
+ CCTK_REAL GRHydro_C2P_failed
+ end subroutine Con2Prim_ptPolytype
+
+ subroutine Con2Prim_ptTracer(cons_tracer, tracer, dens)
+ implicit none
+ CCTK_REAL cons_tracer, tracer, dens
+ end subroutine Con2Prim_ptTracer
+
+ subroutine Con2Prim_ptBoundsTracer(cons_tracer, tracer, rho, one_over_w_lorentz, det)
+ implicit none
+ CCTK_REAL cons_tracer, tracer, rho, one_over_w_lorentz, det
+ end subroutine Con2Prim_ptBoundsTracer
+
+ end interface
+
+end module Con2Prim_fortran_interfaces
File [modified]: GRHydro_Con2Prim.F90
Delta lines: +0 -1
===================================================================
--- branches/ET_2013_05/src/GRHydro_Con2Prim.F90 2013-05-17 03:30:28 UTC (rev 520)
+++ branches/ET_2013_05/src/GRHydro_Con2Prim.F90 2013-05-17 03:43:54 UTC (rev 521)
@@ -11,7 +11,6 @@
#include "cctk_Arguments.h"
#include "cctk_Functions.h"
#include "SpaceMask.h"
-#include "GRHydro_Interfaces.h"
#include "GRHydro_Macros.h"
/*@@
File [modified]: GRHydro_Con2PrimAM.F90
Delta lines: +0 -1
===================================================================
--- branches/ET_2013_05/src/GRHydro_Con2PrimAM.F90 2013-05-17 03:30:28 UTC (rev 520)
+++ branches/ET_2013_05/src/GRHydro_Con2PrimAM.F90 2013-05-17 03:43:54 UTC (rev 521)
@@ -13,7 +13,6 @@
#include "cctk_Arguments.h"
#include "cctk_Functions.h"
#include "SpaceMask.h"
-#include "GRHydro_InterfacesAM.h"
#include "GRHydro_Macros.h"
#define ITER_TOL (1.0e-8)
File [modified]: GRHydro_Con2PrimM.F90
Delta lines: +0 -1
===================================================================
--- branches/ET_2013_05/src/GRHydro_Con2PrimM.F90 2013-05-17 03:30:28 UTC (rev 520)
+++ branches/ET_2013_05/src/GRHydro_Con2PrimM.F90 2013-05-17 03:43:54 UTC (rev 521)
@@ -12,7 +12,6 @@
#include "cctk_Arguments.h"
#include "cctk_Functions.h"
#include "SpaceMask.h"
-#include "GRHydro_InterfacesM.h"
#include "GRHydro_Macros.h"
#define ITER_TOL (1.0e-8)
File [modified]: GRHydro_Interfaces.h
Delta lines: +0 -107
===================================================================
--- branches/ET_2013_05/src/GRHydro_Interfaces.h 2013-05-17 03:30:28 UTC (rev 520)
+++ branches/ET_2013_05/src/GRHydro_Interfaces.h 2013-05-17 03:43:54 UTC (rev 521)
@@ -1,107 +0,0 @@
-module Con2Prim_fortran_interfaces
- implicit none
-
- interface
-
- subroutine Con2Prim_pt(handle, &
- dens, &
- sx, sy, sz, &
- tau, &
- rho, &
- velx, vely, velz, &
- epsilon, press, &
- w_lorentz, &
- uxx, uxy, uxz, &
- uyy, uyz, uzz, &
- det, &
- x, y, z, r, &
- epsnegative, &
- GRHydro_rho_min, pmin, epsmin, &
- GRHydro_reflevel, GRHydro_C2P_failed)
-
- implicit none
- CCTK_INT handle
- CCTK_REAL dens
- CCTK_REAL sx, sy, sz
- CCTK_REAL tau
- CCTK_REAL rho
- CCTK_REAL velx, vely, velz
- CCTK_REAL epsilon, press
- CCTK_REAL w_lorentz
- CCTK_REAL uxx, uxy, uxz
- CCTK_REAL uyy, uyz, uzz
- CCTK_REAL det
- CCTK_REAL x, y, z, r
- logical epsnegative
- CCTK_REAL GRHydro_rho_min, pmin, epsmin
- CCTK_INT GRHydro_reflevel
- CCTK_REAL GRHydro_C2P_failed
- end subroutine Con2Prim_pt
-
- subroutine Con2Prim_ptPolytype(GRHydro_polytrope_handle, &
- dens, &
- sx, sy, sz, &
- tau, &
- rho, &
- velx, vely, velz, &
- eps, press, &
- w_lorentz, &
- uxx, uxy, uxz, uyy, uyz, uzz, &
- det, &
- x, y, z, r, &
- GRHydro_rho_min, &
- GRHydro_reflevel, GRHydro_C2P_failed)
-
- implicit none
- CCTK_INT GRHydro_polytrope_handle
- CCTK_REAL dens
- CCTK_REAL sx, sy, sz
- CCTK_REAL tau
- CCTK_REAL rho
- CCTK_REAL velx, vely, velz
- CCTK_REAL eps, press
- CCTK_REAL w_lorentz
- CCTK_REAL uxx, uxy, uxz
- CCTK_REAL uyy, uyz, uzz
- CCTK_REAL det
- CCTK_REAL x, y, z, r
- CCTK_REAL GRHydro_rho_min
- CCTK_INT GRHydro_reflevel
- CCTK_REAL GRHydro_C2P_failed
- end subroutine Con2Prim_ptPolytype
-
- subroutine Con2Prim_ptTracer(cons_tracer, tracer, dens)
- implicit none
- CCTK_REAL cons_tracer, tracer, dens
- end subroutine Con2Prim_ptTracer
-
- subroutine Con2Prim_ptBoundsTracer(cons_tracer, tracer, rho, one_over_w_lorentz, det)
- implicit none
- CCTK_REAL cons_tracer, tracer, rho, one_over_w_lorentz, det
- end subroutine Con2Prim_ptBoundsTracer
-
- end interface
-
-end module Con2Prim_fortran_interfaces
-
-module Eigenproblem_interfaces
- implicit none
-
- interface
-
- subroutine eigenvalues(handle,rho,velx,vely,velz,eps,w_lorentz,&
- lam,gxx,gxy,gxz,gyy,gyz,gzz,u,alp,beta)
-
- implicit none
-
- CCTK_REAL rho,velx,vely,velz,eps,w_lorentz
- CCTK_REAL lam(5)
- CCTK_REAL gxx,gxy,gxz,gyy,gyz,gzz
- CCTK_REAL alp,beta,u
- CCTK_INT handle
- end subroutine
-
- end interface
-
-end module Eigenproblem_interfaces
-
File [modified]: GRHydro_InterfacesAM.h
Delta lines: +0 -95
===================================================================
--- branches/ET_2013_05/src/GRHydro_InterfacesAM.h 2013-05-17 03:30:28 UTC (rev 520)
+++ branches/ET_2013_05/src/GRHydro_InterfacesAM.h 2013-05-17 03:43:54 UTC (rev 521)
@@ -1,95 +0,0 @@
-module Con2PrimAM_fortran_interfaces
- implicit none
-
- interface
-
- subroutine GRHydro_Con2PrimM_pt( handle, keytemp, prec, &
- local_gam, dens, &
- sx, sy, sz, &
- tau, &
- Bconsx, Bconsy, Bconsz, &
- xye, xtemp, &
- rho, &
- velx, vely, velz,&
- epsilon, pressure,&
- Bx, By, Bz, &
- bsq,&
- w_lorentz, &
- gxx, gxy, gxz, &
- gyy, gyz, gzz, &
- uxx, uxy, uxz,&
- uyy, uyz, uzz,&
- det,&
- epsnegative, &
- retval)
-
- implicit none
- CCTK_INT handle
- CCTK_INT keytemp
- CCTK_REAL prec
- CCTK_REAL local_gam
- CCTK_REAL dens
- CCTK_REAL sx, sy, sz
- CCTK_REAL tau
- CCTK_REAL Bconsx, Bconsy, Bconsz
- CCTK_REAL xye
- CCTK_REAL xtemp
- CCTK_REAL rho
- CCTK_REAL velx, vely, velz
- CCTK_REAL epsilon, pressure
- CCTK_REAL Bx, By, Bz
- CCTK_REAL bsq
- CCTK_REAL w_lorentz
- CCTK_REAL gxx, gxy, gxz
- CCTK_REAL gyy, gyz, gzz
- CCTK_REAL uxx, uxy, uxz
- CCTK_REAL uyy, uyz, uzz
- CCTK_REAL det
- CCTK_INT epsnegative
- CCTK_REAL retval
- end subroutine GRHydro_Con2PrimM_pt
-
- subroutine GRHydro_Con2PrimM_Polytype_pt( handle, local_gam,&
- dens, &
- sx, sy, sz, &
- sc, &
- Bconsx, Bconsy, Bconsz, &
- rho, &
- velx, vely, velz,&
- epsilon, pressure,&
- Bx, By, Bz, &
- bsq,&
- w_lorentz, &
- gxx, gxy, gxz, &
- gyy, gyz, gzz, &
- uxx, uxy, uxz,&
- uyy, uyz, uzz,&
- det,&
- epsnegative, &
- retval)
-
- implicit none
- CCTK_INT handle
- CCTK_REAL local_gam
- CCTK_REAL dens
- CCTK_REAL sx, sy, sz
- CCTK_REAL sc
- CCTK_REAL Bconsx, Bconsy, Bconsz
- CCTK_REAL rho
- CCTK_REAL velx, vely, velz
- CCTK_REAL epsilon, pressure
- CCTK_REAL Bx, By, Bz
- CCTK_REAL bsq
- CCTK_REAL w_lorentz
- CCTK_REAL gxx, gxy, gxz
- CCTK_REAL gyy, gyz, gzz
- CCTK_REAL uxx, uxy, uxz
- CCTK_REAL uyy, uyz, uzz
- CCTK_REAL det
- CCTK_INT epsnegative
- CCTK_REAL retval
- end subroutine GRHydro_Con2PrimM_Polytype_pt
-
- end interface
-
-end module Con2PrimAM_fortran_interfaces
File [modified]: GRHydro_InterfacesM.h
Delta lines: +0 -95
===================================================================
--- branches/ET_2013_05/src/GRHydro_InterfacesM.h 2013-05-17 03:30:28 UTC (rev 520)
+++ branches/ET_2013_05/src/GRHydro_InterfacesM.h 2013-05-17 03:43:54 UTC (rev 521)
@@ -1,95 +0,0 @@
-module Con2PrimM_fortran_interfaces
- implicit none
-
- interface
-
- subroutine GRHydro_Con2PrimM_pt( handle, keytemp, prec, &
- local_gam, dens, &
- sx, sy, sz, &
- tau, &
- Bconsx, Bconsy, Bconsz, &
- xye, xtemp, &
- rho, &
- velx, vely, velz,&
- epsilon, pressure,&
- Bx, By, Bz, &
- bsq,&
- w_lorentz, &
- gxx, gxy, gxz, &
- gyy, gyz, gzz, &
- uxx, uxy, uxz,&
- uyy, uyz, uzz,&
- det,&
- epsnegative, &
- retval)
-
- implicit none
- CCTK_INT handle
- CCTK_INT keytemp
- CCTK_REAL prec
- CCTK_REAL local_gam
- CCTK_REAL dens
- CCTK_REAL sx, sy, sz
- CCTK_REAL tau
- CCTK_REAL Bconsx, Bconsy, Bconsz
- CCTK_REAL xye
- CCTK_REAL xtemp
- CCTK_REAL rho
- CCTK_REAL velx, vely, velz
- CCTK_REAL epsilon, pressure
- CCTK_REAL Bx, By, Bz
- CCTK_REAL bsq
- CCTK_REAL w_lorentz
- CCTK_REAL gxx, gxy, gxz
- CCTK_REAL gyy, gyz, gzz
- CCTK_REAL uxx, uxy, uxz
- CCTK_REAL uyy, uyz, uzz
- CCTK_REAL det
- CCTK_INT epsnegative
- CCTK_REAL retval
- end subroutine GRHydro_Con2PrimM_pt
-
- subroutine GRHydro_Con2PrimM_Polytype_pt( handle, local_gam,&
- dens, &
- sx, sy, sz, &
- sc, &
- Bconsx, Bconsy, Bconsz, &
- rho, &
- velx, vely, velz,&
- epsilon, pressure,&
- Bx, By, Bz, &
- bsq,&
- w_lorentz, &
- gxx, gxy, gxz, &
- gyy, gyz, gzz, &
- uxx, uxy, uxz,&
- uyy, uyz, uzz,&
- det,&
- epsnegative, &
- retval)
-
- implicit none
- CCTK_INT handle
- CCTK_REAL local_gam
- CCTK_REAL dens
- CCTK_REAL sx, sy, sz
- CCTK_REAL sc
- CCTK_REAL Bconsx, Bconsy, Bconsz
- CCTK_REAL rho
- CCTK_REAL velx, vely, velz
- CCTK_REAL epsilon, pressure
- CCTK_REAL Bx, By, Bz
- CCTK_REAL bsq
- CCTK_REAL w_lorentz
- CCTK_REAL gxx, gxy, gxz
- CCTK_REAL gyy, gyz, gzz
- CCTK_REAL uxx, uxy, uxz
- CCTK_REAL uyy, uyz, uzz
- CCTK_REAL det
- CCTK_INT epsnegative
- CCTK_REAL retval
- end subroutine GRHydro_Con2PrimM_Polytype_pt
-
- end interface
-
-end module Con2PrimM_fortran_interfaces
File [modified]: make.code.defn
Delta lines: +3 -1
===================================================================
--- branches/ET_2013_05/src/make.code.defn 2013-05-17 03:30:28 UTC (rev 520)
+++ branches/ET_2013_05/src/make.code.defn 2013-05-17 03:43:54 UTC (rev 521)
@@ -76,7 +76,9 @@
GRHydro_EvolutionMask.F90\
GRHydro_WENOReconstruct.F90\
GRHydro_WENOScalars.F90 \
- GRHydro_MP5Reconstruct.F90
+ GRHydro_MP5Reconstruct.F90 \
+ Con2Prim_fortran_interfaces.F90 \
+ Con2PrimM_fortran_interfaces.F90
# Subdirectories containing source files
SUBDIRS =
More information about the Commits
mailing list