From 98def174f187fcd32539695e7de6d2ec022fb44a Mon Sep 17 00:00:00 2001 From: bmundim Date: Mon, 3 May 2010 03:06:10 +0000 Subject: file/parameter string replacement from whisky to GRHydro git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/TOVSolver/trunk@109 1bdb13ef-5d69-4035-bb54-08abeb3aa7f1 --- configuration.ccl | 2 +- doc/documentation.tex | 2 +- interface.ccl | 2 +- param.ccl | 4 ++-- schedule.ccl | 2 +- src/external.inc | 38 +++++++++++++++++++------------------- src/tov.c | 4 ++-- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/configuration.ccl b/configuration.ccl index 7643c4d..d666279 100644 --- a/configuration.ccl +++ b/configuration.ccl @@ -1,4 +1,4 @@ -# Configuration definition for thorn Whisky +# Configuration definition for thorn GRHydro REQUIRES THORNS: Boundary CartGrid3D SpaceMask diff --git a/doc/documentation.tex b/doc/documentation.tex index d84d659..00e4d65 100644 --- a/doc/documentation.tex +++ b/doc/documentation.tex @@ -332,7 +332,7 @@ the current thorns ({\tt CosmologicalConstant}, the hydro code, the scalar field code) all use the {\tt CalcTmunu} interface. You also have the possibility to use a parameter -{\tt whiskytovsolver::TOV\_Separation} to obtain a spacetime consisting +{\tt GRHydrotovsolver::TOV\_Separation} to obtain a spacetime consisting of one TOV-system for $x>0$ and a second (similar) for $x<0$. This parameter sets the separation of the centers of two neutron stars, has to be positive and should be larger than twice the radius of one star.\\ diff --git a/interface.ccl b/interface.ccl index 81a4800..b118756 100644 --- a/interface.ccl +++ b/interface.ccl @@ -1,7 +1,7 @@ # Interface definition for thorn TOVSolver implements: TOVSolver -inherits: Whisky, Constants +inherits: GRHydro, Constants USES INCLUDE: constants.h diff --git a/param.ccl b/param.ccl index 3641cce..3c05d85 100644 --- a/param.ccl +++ b/param.ccl @@ -158,12 +158,12 @@ shares:StaticConformal USES KEYWORD conformal_storage -shares:Whisky +shares:GRHydro USES real rho_abs_min USES real rho_rel_min USES REAL initial_rho_abs_min USES REAL initial_rho_rel_min USES REAL initial_atmosphere_factor -USES real whisky_rho_central +USES real GRHydro_rho_central diff --git a/schedule.ccl b/schedule.ccl index 34fc47f..d54c9c9 100644 --- a/schedule.ccl +++ b/schedule.ccl @@ -75,7 +75,7 @@ if (TOV_fake_evolution) { LANG: C } "prepare for fake evolution" - schedule TOV_C_Exact IN MoL_PostStep AFTER Whisky_PostStep + schedule TOV_C_Exact IN MoL_PostStep AFTER GRHydro_PostStep { LANG: C } "use fake evolution" diff --git a/src/external.inc b/src/external.inc index f6c48fa..08aab6b 100644 --- a/src/external.inc +++ b/src/external.inc @@ -372,45 +372,45 @@ CCTK_INT TOV_Rescale_Sources( CCTK_INFO("Rescaling Sources"); - /* get Whisky variables */ + /* get GRHydro variables */ rho =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "HydroBase::rho"); press =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "HydroBase::press"); eps =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "HydroBase::eps"); - dens =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "Whisky::dens"); - tau =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "Whisky::tau"); - w_lorentz=(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "Whisky::w_lorentz"); + dens =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "GRHydro::dens"); + tau =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "GRHydro::tau"); + w_lorentz=(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "GRHydro::w_lorentz"); vel0 =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "HydroBase::vel[0]"); vel1 =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "HydroBase::vel[1]"); vel2 =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "HydroBase::vel[2]"); - scon0 =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "Whisky::scon[0]"); - scon1 =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "Whisky::scon[1]"); - scon2 =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "Whisky::scon[2]"); + scon0 =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "GRHydro::scon[0]"); + scon1 =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "GRHydro::scon[1]"); + scon2 =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "GRHydro::scon[2]"); rho_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "HydroBase::rho"); press_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "HydroBase::press"); eps_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "HydroBase::eps"); - dens_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "Whisky::dens"); - tau_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "Whisky::tau"); - w_lorentz_p=(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "Whisky::w_lorentz"); + dens_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "GRHydro::dens"); + tau_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "GRHydro::tau"); + w_lorentz_p=(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "GRHydro::w_lorentz"); vel0_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "HydroBase::vel[0]"); vel1_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "HydroBase::vel[1]"); vel2_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "HydroBase::vel[2]"); - scon0_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "Whisky::scon[0]"); - scon1_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "Whisky::scon[1]"); - scon2_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "Whisky::scon[2]"); + scon0_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "GRHydro::scon[0]"); + scon1_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "GRHydro::scon[1]"); + scon2_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "GRHydro::scon[2]"); rho_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "HydroBase::rho"); press_p_p=(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "HydroBase::press"); eps_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "HydroBase::eps"); - dens_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "Whisky::dens"); - tau_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "Whisky::tau"); - w_lorentz_p_p=(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "Whisky::w_lorentz"); + dens_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "GRHydro::dens"); + tau_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "GRHydro::tau"); + w_lorentz_p_p=(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "GRHydro::w_lorentz"); vel0_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "HydroBase::vel[0]"); vel1_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "HydroBase::vel[1]"); vel2_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "HydroBase::vel[2]"); - scon0_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "Whisky::scon[0]"); - scon1_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "Whisky::scon[1]"); - scon2_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "Whisky::scon[2]"); + scon0_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "GRHydro::scon[0]"); + scon1_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "GRHydro::scon[1]"); + scon2_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "GRHydro::scon[2]"); /* get u */ u=calloc(size, sizeof(CCTK_REAL)); diff --git a/src/tov.c b/src/tov.c index e71df5d..adbb384 100644 --- a/src/tov.c +++ b/src/tov.c @@ -219,8 +219,8 @@ void TOV_C_Integrate_RHS(CCTK_ARGUMENTS) star_i = star * TOV_Num_Radial; /* check for parameters */ - if ((TOV_Rho_Central[star]==0.0) && (whisky_rho_central>0.0)) - rho_central=whisky_rho_central; + if ((TOV_Rho_Central[star]==0.0) && (GRHydro_rho_central>0.0)) + rho_central=GRHydro_rho_central; else rho_central=TOV_Rho_Central[star]; -- cgit v1.2.3