Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] WeylScal4/trunk/m/ (Rev. 60)
by ian.hinder＠aei.mpg.de 13 Sep '10

13 Sep '10

User: hinder Date: 2010/09/13 06:16 AM Modified: /trunk/m/ Makefile, WeylScal4.m, WeylScal4.patch Log: Schedule calculation automatically including boundary conditions Newer versions of Kranc default to scheduling calculations in MoL_PseudoEvolution and applying the boundary conditions if no Schedule string is supplied. Here WeylScal4 is updated to use this feature, which removes the need for manual patching. File Changes: Directory: /trunk/m/ ==================== File [modified]: Makefile Delta lines: +0 -1 =================================================================== --- trunk/m/Makefile 2010-09-13 11:13:03 UTC (rev 59) +++ trunk/m/Makefile 2010-09-13 11:16:27 UTC (rev 60) @@ -8,7 +8,6 @@ WeylScal4.out: WeylScal4.m rm -rf WeylScal4 ./runmath.sh $^ - patch -p1 -d WeylScal4 <WeylScal4.patch for thorn in WeylScal4; do \ ./copy-if-changed.sh $$thorn/configuration.ccl ../../$$thorn/configuration.ccl && \ ./copy-if-changed.sh $$thorn/interface.ccl ../../$$thorn/interface.ccl && \ File [modified]: WeylScal4.m Delta lines: +2 -26 =================================================================== --- trunk/m/WeylScal4.m 2010-09-13 11:13:03 UTC (rev 59) +++ trunk/m/WeylScal4.m 2010-09-13 11:16:27 UTC (rev 60) @@ -124,7 +124,6 @@ PsisCalc[fdOrder_, PD_] := { Name -> "psis_calc_" <> fdOrder, - Schedule -> {"in WeylScal4_Calculate as calc_np"}, Where -> Interior, ConditionalOnKeyword -> {"fd_order", fdOrder}, Shorthands -> shorthands, @@ -270,28 +269,6 @@ } }; -(* Dummy calculation routine to fool Kranc into thinking that the Weyl scalars - are evolved quantities. This way we get code to register boundary conditions. - Unfortunately it also registers with MoL so we have to remove that code by hand. -*) -DummyCalc := -{ - Name -> "dummycalc", - Schedule -> {"in Nowhere_Nevertoberun"}, - Equations -> - { - dot[Psi4r] -> 0, - dot[Psi4i] -> 0 (*, - dot[Psi3r] -> 0, - dot[Psi3i] -> 0, - dot[Psi2r] -> 0, - dot[Psi2i] -> 0, - dot[Psi1r] -> 0, - dot[Psi1i] -> 0, - dot[Psi0r] -> 0, - dot[Psi0i] -> 0 *) - } -} (**************************************************************************** Construct the thorn @@ -312,8 +289,7 @@ calculations = { PsisCalc["2nd", PDstandard2nd], - PsisCalc["4th", PDstandard4th], - DummyCalc + PsisCalc["4th", PDstandard4th] }; CreateKrancThornTT[groups, ".", "WeylScal4", @@ -322,4 +298,4 @@ PartialDerivatives -> derivatives, KeywordParameters -> keywordParameters, RealParameters -> realParameters, - InheritedImplementations -> {"admbase"}]; + InheritedImplementations -> {"admbase", "methodoflines"}]; File [modified]: WeylScal4.patch Delta lines: +0 -181 =================================================================== --- trunk/m/WeylScal4.patch 2010-09-13 11:13:03 UTC (rev 59) +++ trunk/m/WeylScal4.patch 2010-09-13 11:16:27 UTC (rev 60) @@ -1,181 +0,0 @@ -diff -r -c a/interface.ccl b/interface.ccl -*** a/interface.ccl 2010-05-03 23:48:16.810592882 -0400 ---- b/interface.ccl 2010-05-03 23:51:37.206592882 -0400 -*************** -*** 34,48 **** - { - Psi4r - } "Psi4r_group" -- -- public: -- CCTK_REAL Psi4i_grouprhs type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1 tensorparity=-1' -- { -- Psi4irhs -- } "Psi4i_grouprhs" -- -- public: -- CCTK_REAL Psi4r_grouprhs type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1 tensorparity=1' -- { -- Psi4rrhs -- } "Psi4r_grouprhs" ---- 34,36 ---- -diff -r -c a/param.ccl b/param.ccl -*** a/param.ccl 2010-05-03 23:48:16.811592882 -0400 ---- b/param.ccl 2010-05-03 23:51:37.207592882 -0400 -*************** -*** 52,75 **** - } "2nd" - - restricted: -- CCTK_INT WeylScal4_MaxNumEvolvedVars "Number of evolved variables used by this thorn" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Evolved_Vars -- { -- 2:2 :: "Number of evolved variables used by this thorn" -- } 2 -- -- restricted: - CCTK_INT timelevels "Number of active timelevels" - { - 0:3 :: "" - } 3 - - restricted: -- CCTK_INT rhs_timelevels "Number of active RHS timelevels" -- { -- 0:3 :: "" -- } 1 -- -- restricted: - CCTK_INT psis_calc_2nd_calc_every "psis_calc_2nd_calc_every" - { - *:* :: "" ---- 52,63 ---- -diff -r -c a/schedule.ccl b/schedule.ccl -*** a/schedule.ccl 2010-05-03 23:48:16.811592882 -0400 ---- b/schedule.ccl 2010-05-03 23:51:37.206592882 -0400 -*************** -*** 27,58 **** - STORAGE: Psi4r_group[3] - } - -- if (rhs_timelevels == 1) -- { -- STORAGE: Psi4i_grouprhs[1] -- } -- if (rhs_timelevels == 2) -- { -- STORAGE: Psi4i_grouprhs[2] -- } -- if (rhs_timelevels == 3) -- { -- STORAGE: Psi4i_grouprhs[3] -- } -- -- if (rhs_timelevels == 1) -- { -- STORAGE: Psi4r_grouprhs[1] -- } -- if (rhs_timelevels == 2) -- { -- STORAGE: Psi4r_grouprhs[2] -- } -- if (rhs_timelevels == 3) -- { -- STORAGE: Psi4r_grouprhs[3] -- } -- - schedule WeylScal4_Startup at STARTUP - { - LANG: C ---- 27,32 ---- -*************** -*** 72,77 **** ---- 46,55 ---- - } "register symmetries" - - -+ schedule group WeylScal4_Calculate in MoL_PseudoEvolution -+ { -+ } "Calculate the Newman-Penrose quantities" -+ - if (CCTK_EQUALS(fd_order, "2nd")) - { - schedule psis_calc_2nd in WeylScal4_Calculate as calc_np -*************** -*** 93,104 **** - } "psis_calc_4th" - } - -! schedule dummycalc in Nowhere_Nevertoberun -! { -! LANG: C -! } "dummycalc" -! -! schedule WeylScal4_SelectBoundConds in MoL_PostStep - { - LANG: C - OPTIONS: level ---- 70,76 ---- - } "psis_calc_4th" - } - -! schedule WeylScal4_SelectBoundConds in WeylScal4_Boundaries - { - LANG: C - OPTIONS: level -*************** -*** 112,118 **** - OPTIONS: meta - } "check boundaries treatment" - -! schedule group ApplyBCs as WeylScal4_ApplyBCs in MoL_PostStep after WeylScal4_SelectBoundConds - { - # no language specified - } "Apply boundary conditions controlled by thorn Boundary" ---- 84,105 ---- - OPTIONS: meta - } "check boundaries treatment" - -! schedule group ApplyBCs as WeylScal4_ApplyBCs in WeylScal4_Boundaries after WeylScal4_SelectBoundConds -! { -! # no language specified -! } "Apply boundary conditions controlled by thorn Boundary" -! -! schedule group WeylScal4_Boundaries in WeylScal4_Calculate after calc_np -! { -! # no language specified -! } "Apply boundary conditions controlled by thorn Boundary" -! -! schedule group WeylScal4_Boundaries in CCTK_POSTRESTRICTINITIAL -! { -! # no language specified -! } "Apply boundary conditions controlled by thorn Boundary" -! -! schedule group WeylScal4_Boundaries in CCTK_POSTRESTRICT - { - # no language specified - } "Apply boundary conditions controlled by thorn Boundary" -diff -r -c a/src/RegisterMoL.c b/src/RegisterMoL.c -*** a/src/RegisterMoL.c 2010-05-03 23:48:16.811592882 -0400 ---- b/src/RegisterMoL.c 2010-05-03 23:51:37.206592882 -0400 -*************** -*** 12,18 **** - CCTK_INT ierr = 0; - - /* Register all the evolved grid functions with MoL */ -- ierr += MoLRegisterEvolved(CCTK_VarIndex("WeylScal4::Psi4i"), CCTK_VarIndex("WeylScal4::Psi4irhs")); -- ierr += MoLRegisterEvolved(CCTK_VarIndex("WeylScal4::Psi4r"), CCTK_VarIndex("WeylScal4::Psi4rrhs")); - return; - } ---- 12,16 ---- -diff -r -c a/src/make.code.defn b/src/make.code.defn -*** a/src/make.code.defn 2010-05-03 23:48:16.811592882 -0400 ---- b/src/make.code.defn 2010-05-03 23:51:37.206592882 -0400 -*************** -*** 1,3 **** - # File produced by Kranc - -! SRCS = Startup.c RegisterMoL.c RegisterSymmetries.c psis_calc_2nd.c psis_calc_4th.c dummycalc.c Boundaries.c ---- 1,3 ---- - # File produced by Kranc - -! SRCS = Startup.c RegisterMoL.c RegisterSymmetries.c psis_calc_2nd.c psis_calc_4th.c Boundaries.c

1 0

[svn:einsteintoolkit] WeylScal4/trunk/m/ (Rev. 59)
by ian.hinder＠aei.mpg.de 13 Sep '10

13 Sep '10

User: hinder Date: 2010/09/13 06:13 AM Modified: /trunk/m/ runmath.sh Log: runmath.sh: Find Kranc correctly in new Einstein Toolkit checkout File Changes: Directory: /trunk/m/ ==================== File [modified]: runmath.sh Delta lines: +3 -1 =================================================================== --- trunk/m/runmath.sh 2010-07-12 14:50:05 UTC (rev 58) +++ trunk/m/runmath.sh 2010-09-13 11:13:03 UTC (rev 59) @@ -17,7 +17,7 @@ KRANCPATH="${KRANCPATH:+$KRANCPATH}" if [ -z "$KRANCPATH" ] ; then - KRANCPATHS=(. ../../../../arrangements/.. ../../../arrangements/.. $HOME) + KRANCPATHS=(. ../../../../arrangements/../repos ../../../arrangements/../repos $HOME) # look for Kranc in a number of likely locations # choice 2 and 3 are $CCTK_HOME if the thorn resides in arrangements or # git-repos @@ -55,6 +55,8 @@ echo -e "Could not find Kranc. Expect trouble unless you have made sure Mathematica\nwill find Kranc. You might also consider setting \$KRANCPATH." fi +echo "MATHPATH = $MATHPATH" + error=$(basename $script .m).err output=$(basename $script .m).out

1 0

[svn:einsteintoolkit] Multipole/trunk/src/ (Rev. 66)
by ian.hinder＠aei.mpg.de 10 Sep '10

10 Sep '10

User: hinder Date: 2010/09/10 01:51 PM Modified: /trunk/src/ multipole.cc Log: Remove default fallback value for "variables" string Now if no variables are supplied, none will be decomposed File Changes: Directory: /trunk/src/ ====================== File [modified]: multipole.cc Delta lines: +1 -16 =================================================================== --- trunk/src/multipole.cc 2010-07-12 14:50:03 UTC (rev 65) +++ trunk/src/multipole.cc 2010-09-10 18:51:58 UTC (rev 66) @@ -83,22 +83,7 @@ vars.n_vars = 0; vars.vars = v; - const char *actual_var_string = strlen(var_string) == 0 ? - "WeylScal4::Psi4r{sw=-2 cmplx=\'WeylScal4::Psi4i\' name=\'psi4\'}" : - var_string; - - if (strlen(var_string) == 0) - { - static bool have_warned = false; - if (!have_warned) - { - CCTK_VWarn (1, __LINE__, __FILE__, CCTK_THORNSTRING, - "WARNING: No Multipole::variables string has been specified. For compatibility, the current default is to use \"%s\" but in future, this default will change to \"\". Please update your parameter files to include this new parameter.", actual_var_string); - have_warned = true; - } - } - - int ierr = CCTK_TraverseString(actual_var_string, fill_variable, &vars, CCTK_GROUP_OR_VAR); + int ierr = CCTK_TraverseString(var_string, fill_variable, &vars, CCTK_GROUP_OR_VAR); assert(ierr > 0); *n_variables = vars.n_vars;

1 0

[svn:einsteintoolkit] manifest/trunk/ (Rev. 37)
by knarf＠cct.lsu.edu 08 Sep '10

08 Sep '10

User: knarf Date: 2010/09/08 03:51 PM Modified: /trunk/ einsteintoolkit.th Log: use libjpeg instead of jpeg6b File Changes: Directory: /trunk/ ================== File [modified]: einsteintoolkit.th Delta lines: +1 -2 =================================================================== --- trunk/einsteintoolkit.th 2010-08-11 03:15:13 UTC (rev 36) +++ trunk/einsteintoolkit.th 2010-09-08 20:51:39 UTC (rev 37) @@ -75,8 +75,6 @@ #CactusElliptic/EllPETSc CactusElliptic/EllSOR -CactusExternal/jpeg6b - CactusIO/IOJpeg CactusNumerical/MoL @@ -181,6 +179,7 @@ ExternalLibraries/HDF5 ExternalLibraries/LAPACK ExternalLibraries/LORENE +ExternalLibraries/libjpeg TAT/TATelliptic

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/util/ (Rev. 153)
by knarf＠cct.lsu.edu 08 Sep '10

08 Sep '10

User: knarf Date: 2010/09/08 02:04 PM Modified: /trunk/src/util/ Riemann1d.f90 Log: get rid of deleted Fortran statement 'pause' File Changes: Directory: /trunk/src/util/ =========================== File [modified]: Riemann1d.f90 Delta lines: +8 -2 =================================================================== --- trunk/src/util/Riemann1d.f90 2010-08-27 20:30:51 UTC (rev 152) +++ trunk/src/util/Riemann1d.f90 2010-09-08 19:04:46 UTC (rev 153) @@ -429,7 +429,10 @@ b = 1.d0 - a c = ha * (known(3) - guess(3)) / known(1) - ha * ha - if (c > b * b / 4.d0 / a) pause "unphysical enthalpy" + if (c > b * b / 4.d0 / a) then + write (*,*) "unphysical enthalpy" + stop + endif h = (-b + sqrt(b * b - 4.d0 * a * c)) / 2.d0 / a @@ -727,7 +730,10 @@ b = 1.d0 - a c = ha * (known(3) - guess(3)) / known(1) - ha * ha - if (c > b * b / 4.d0 / a) pause "unphysical enthalpy" + if (c > b * b / 4.d0 / a) then + write(*,*) "unphysical enthalpy" + stop + endif h = (-b + sqrt(b * b - 4.d0 * a * c)) / 2.d0 / a

1 0

[svn:einsteintoolkit] www/about/members/ (Rev. 322)
by gallen＠cct.lsu.edu 02 Sep '10

02 Sep '10

User: gallen Date: 2010/09/02 01:09 PM Modified: /about/members/ index.php Log: Jakob Hansen File Changes: Directory: /about/members/ ========================== File [modified]: index.php Delta lines: +5 -0 =================================================================== --- about/members/index.php 2010-08-04 21:49:13 UTC (rev 321) +++ about/members/index.php 2010-09-02 18:09:01 UTC (rev 322) @@ -71,6 +71,11 @@ <li>Deirdre Shoemaker</li> </ul> + <li><b>Korea Institute of Science and Technology Information</b></li> + <ul> + <li>Jakob Hansen</li> + </ul> + <li><b>NASA Goddard Space Flight Center</b></li> <ul> <li>Bernard Kelly</li>

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 152)
by cott＠tapir.caltech.edu 27 Aug '10

27 Aug '10

User: cott Date: 2010/08/27 03:30 PM Modified: /trunk/ interface.ccl, interface.ccl.omni /trunk/src/ GRHydro_Boundaries.F90, GRHydro_Con2Prim.F90, GRHydro_EoSChangeGamma.F90, GRHydro_FluxSplit.F90, GRHydro_HLLE.F90, GRHydro_HLLEPoly.F90, GRHydro_Marquina.F90, GRHydro_PPM.F90, GRHydro_ParamCheck.F90, GRHydro_Prim2Con.F90, GRHydro_Reconstruct.F90, GRHydro_ReconstructPoly.F90, GRHydro_RiemannSolve.F90, GRHydro_RoeSolver.F90, GRHydro_Source.F90, GRHydro_Tmunu.F90, GRHydro_UpdateMask.F90, Utils.F90 Log: * remove dependence on StaticConformal * change calculation of the determinant of the 3-metric from a subroutine call to a macro. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Boundaries.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Con2Prim.F90 Delta lines: <Unavailable> File [modified]: GRHydro_EoSChangeGamma.F90 Delta lines: <Unavailable> File [modified]: GRHydro_FluxSplit.F90 Delta lines: <Unavailable> File [modified]: GRHydro_HLLE.F90 Delta lines: <Unavailable> File [modified]: GRHydro_HLLEPoly.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Marquina.F90 Delta lines: <Unavailable> File [modified]: GRHydro_PPM.F90 Delta lines: <Unavailable> File [modified]: GRHydro_ParamCheck.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Prim2Con.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Reconstruct.F90 Delta lines: <Unavailable> File [modified]: GRHydro_ReconstructPoly.F90 Delta lines: <Unavailable> File [modified]: GRHydro_RiemannSolve.F90 Delta lines: <Unavailable> File [modified]: GRHydro_RoeSolver.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Source.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Tmunu.F90 Delta lines: <Unavailable> File [modified]: GRHydro_UpdateMask.F90 Delta lines: <Unavailable> File [modified]: Utils.F90 Delta lines: <Unavailable> Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: <Unavailable> File [modified]: interface.ccl.omni Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 151)
by cott＠tapir.caltech.edu 26 Aug '10

26 Aug '10

User: cott Date: 2010/08/26 03:06 PM Added: /trunk/src/ GRHydro_Macros.h Log: * add a source file containing macro definitions File Changes: Directory: /trunk/src/ ====================== File [added]: GRHydro_Macros.h Delta lines: +3 -0 =================================================================== --- trunk/src/GRHydro_Macros.h (rev 0) +++ trunk/src/GRHydro_Macros.h 2010-08-26 20:06:30 UTC (rev 151) @@ -0,0 +1,3 @@ +#define SPATIAL_DETERMINANT(gxx,gxy,gxz,gyy,gyz,gzz) \ + (-(gxz)**2*(gyy) + 2*(gxy)*(gxz)*(gyz) - (gxx)*(gyz)**2 - (gxy)**2*(gzz) \ + + (gxx)*(gyy)*(gzz))

1 0

[svn:einsteintoolkit] incoming/EOS_Omni/ (Rev. 8)
by cott＠tapir.caltech.edu 26 Aug '10

26 Aug '10

User: cott Date: 2010/08/26 02:26 PM Added: /EOS_Omni/src/ EOS_Omni_SingleVarCalls_harm.F90 Modified: /EOS_Omni/ interface.ccl /EOS_Omni/src/ make.code.defn Log: * add routines for MHD with Harm-based con2prim File Changes: Directory: /EOS_Omni/ ===================== File [modified]: interface.ccl Delta lines: +54 -0 =================================================================== --- EOS_Omni/interface.ccl 2010-08-18 18:41:07 UTC (rev 7) +++ EOS_Omni/interface.ccl 2010-08-26 19:26:54 UTC (rev 8) @@ -97,3 +97,57 @@ CCTK_INT OUT anyerr) PROVIDES FUNCTION EOS_Omni_RestMassDensityFromEpsPress WITH EOS_Omni_EOS_RestMassDensityFromEpsPress LANGUAGE Fortran + +################################################################################ +# the following routines are needed for MHD con2prim based on the Harm Code + +void FUNCTION EOS_Omni_press_f_hrho_v2_rhoW(CCTK_INT IN eoskey, \ + CCTK_INT IN havetemp, \ + CCTK_REAL IN rf_precision, \ + CCTK_INT IN npoints, \ + CCTK_REAL IN ARRAY hrho, \ + CCTK_REAL IN ARRAY v2, \ + CCTK_REAL IN ARRAY rhoW, \ + CCTK_REAL INOUT ARRAY eps, \ + CCTK_REAL INOUT ARRAY temp, \ + CCTK_REAL IN ARRAY ye, \ + CCTK_REAL OUT ARRAY press, \ + CCTK_INT OUT ARRAY keyerr, \ + CCTK_INT OUT anyerr) + +PROVIDES FUNCTION EOS_Omni_press_f_hrho_v2_rhoW WITH EOS_Omni_EOS_Press_f_hrho_v2_rhoW LANGUAGE Fortran + + +void FUNCTION EOS_Omni_dpdhrho_f_hrho_v2_rhoW(CCTK_INT IN eoskey, \ + CCTK_INT IN havetemp, \ + CCTK_REAL IN rf_precision, \ + CCTK_INT IN npoints, \ + CCTK_REAL IN ARRAY hrho, \ + CCTK_REAL IN ARRAY v2, \ + CCTK_REAL IN ARRAY rhoW, \ + CCTK_REAL INOUT ARRAY eps, \ + CCTK_REAL INOUT ARRAY temp, \ + CCTK_REAL IN ARRAY ye, \ + CCTK_REAL OUT ARRAY dpdhrho,\ + CCTK_INT OUT ARRAY keyerr, \ + CCTK_INT OUT anyerr) + +PROVIDES FUNCTION EOS_Omni_dpdhrho_f_hrho_v2_rhoW WITH EOS_Omni_EOS_dpdhrho_f_hrho_v2_rhoW LANGUAGE Fortran + +void FUNCTION EOS_Omni_dpdv2_f_hrho_v2_rhoW(CCTK_INT IN eoskey, \ + CCTK_INT IN havetemp, \ + CCTK_REAL IN rf_precision, \ + CCTK_INT IN npoints, \ + CCTK_REAL IN ARRAY hrho, \ + CCTK_REAL IN ARRAY v2, \ + CCTK_REAL IN ARRAY rhoW, \ + CCTK_REAL INOUT ARRAY eps, \ + CCTK_REAL INOUT ARRAY temp, \ + CCTK_REAL IN ARRAY ye, \ + CCTK_REAL OUT ARRAY dpdv2, \ + CCTK_INT OUT ARRAY keyerr, \ + CCTK_INT OUT anyerr) + +PROVIDES FUNCTION EOS_Omni_dpdv2_f_hrho_v2_rhoW WITH EOS_Omni_EOS_dpdv2_f_hrho_v2_rhoW LANGUAGE Fortran + +################################################################################ Directory: /EOS_Omni/src/ ========================= File [added]: EOS_Omni_SingleVarCalls_harm.F90 Delta lines: +170 -0 =================================================================== --- EOS_Omni/src/EOS_Omni_SingleVarCalls_harm.F90 (rev 0) +++ EOS_Omni/src/EOS_Omni_SingleVarCalls_harm.F90 2010-08-26 19:26:54 UTC (rev 8) @@ -0,0 +1,170 @@ +#include "cctk.h" +#include "cctk_Parameters.h" +#include "cctk_Arguments.h" +#include "cctk_Functions.h" + +! eoskey: +! 1 --- polytropic EOS +! 2 --- gamma-law EOS +! 3 --- hybrid EOS +! 4 --- finite-T microphysical NSE EOS + +subroutine EOS_Omni_EOS_Press_f_hrho_v2_rhoW(eoskey,keytemp,rf_precision,npoints,& + hrho,v2,rhoW,eps,temp,ye,press,keyerr,anyerr) + + use EOS_Omni_Module + implicit none + DECLARE_CCTK_PARAMETERS + DECLARE_CCTK_FUNCTIONS + + CCTK_INT, intent(in) :: eoskey,keytemp,npoints + CCTK_INT, intent(out) :: keyerr(npoints) + CCTK_INT, intent(out) :: anyerr + CCTK_REAL, intent(in) :: rf_precision + CCTK_REAL, intent(in) :: hrho(npoints),v2(npoints) + CCTK_REAL, intent(in) :: rhoW(npoints),ye(npoints) + CCTK_REAL, intent(inout) :: eps(npoints), temp(npoints) + CCTK_REAL, intent(out) :: press(npoints) + + ! local vars + integer :: i + real*8 :: gtmp1,gtmp2 + character(256) :: warnstring + real*8 :: hybrid_local_gamma, hybrid_local_k_cgs, & + hybrid_p_poly, hybrid_p_th + real*8,parameter :: zero = 0.0d0 + + anyerr = 0 + keyerr(:) = 0 + + select case (eoskey) + case (1) + ! polytropic EOS + call CCTK_WARN(0,"Polytropic EOS not implemented for press_f_hro_v2_rhoW") + case (2) + ! gamma-law EOS + if(keytemp.eq.1) then + call CCTK_WARN(0,"keytemp.eq.1 not implemented for press_f_hro_v2_rhoW") + endif + do i=1,npoints + gtmp1 = 1.0d0 - v2(i) + gtmp2 = rhoW(i)*sqrt(gtmp1) + press(i) = (gl_gamma - 1.0d0)/(gl_gamma) * & + (hrho(i)*gtmp1 - gtmp2) + eps(i) = press(i) / (gl_gamma - 1.0d0) / gtmp2 + enddo + case (3) + ! hybrid EOS + call CCTK_WARN(0,"Hybrid EOS not implemented for press_f_hro_v2_rhoW") + + case DEFAULT + write(warnstring,*) "eoskey ",eoskey," not implemented!" + call CCTK_WARN(0,warnstring) + end select + +end subroutine EOS_Omni_EOS_Press_f_hrho_v2_rhoW + + +subroutine EOS_Omni_EOS_dpdhrho_f_hrho_v2_rhoW(eoskey,keytemp,rf_precision,npoints,& + hrho,v2,rhoW,eps,temp,ye,dpdhrho,keyerr,anyerr) + + use EOS_Omni_Module + implicit none + DECLARE_CCTK_PARAMETERS + DECLARE_CCTK_FUNCTIONS + + CCTK_INT, intent(in) :: eoskey,keytemp,npoints + CCTK_INT, intent(out) :: keyerr(npoints) + CCTK_INT, intent(out) :: anyerr + CCTK_REAL, intent(in) :: rf_precision + CCTK_REAL, intent(in) :: hrho(npoints),v2(npoints) + CCTK_REAL, intent(in) :: rhoW(npoints),ye(npoints) + CCTK_REAL, intent(inout) :: eps(npoints), temp(npoints) + CCTK_REAL, intent(out) :: dpdhrho(npoints) + + ! local vars + integer :: i + character(256) :: warnstring + real*8 :: hybrid_local_gamma, hybrid_local_k_cgs, & + hybrid_p_poly, hybrid_p_th + real*8,parameter :: zero = 0.0d0 + + anyerr = 0 + keyerr(:) = 0 + + select case (eoskey) + case (1) + ! polytropic EOS + call CCTK_WARN(0,"Polytropic EOS not implemented for press_f_hro_v2_rhoW") + case (2) + ! gamma-law EOS + if(keytemp.eq.1) then + call CCTK_WARN(0,"keytemp.eq.1 not implemented for press_f_hro_v2_rhoW") + endif + do i=1,npoints + dpdhrho(i) = (gl_gamma - 1.0d0) * (1.0d0 - v2(i)) / (gl_gamma) + enddo + case (3) + ! hybrid EOS + call CCTK_WARN(0,"Hybrid EOS not implemented for press_f_hro_v2_rhoW") + + case DEFAULT + write(warnstring,*) "eoskey ",eoskey," not implemented!" + call CCTK_WARN(0,warnstring) + end select + +end subroutine EOS_Omni_EOS_dpdhrho_f_hrho_v2_rhoW + + +subroutine EOS_Omni_EOS_dpdv2_f_hrho_v2_rhoW(eoskey,keytemp,rf_precision,npoints,& + hrho,v2,rhoW,eps,temp,ye,dpdv2,keyerr,anyerr) + + use EOS_Omni_Module + implicit none + DECLARE_CCTK_PARAMETERS + DECLARE_CCTK_FUNCTIONS + + CCTK_INT, intent(in) :: eoskey,keytemp,npoints + CCTK_INT, intent(out) :: keyerr(npoints) + CCTK_INT, intent(out) :: anyerr + CCTK_REAL, intent(in) :: rf_precision + CCTK_REAL, intent(in) :: hrho(npoints),v2(npoints) + CCTK_REAL, intent(in) :: rhoW(npoints),ye(npoints) + CCTK_REAL, intent(inout) :: eps(npoints), temp(npoints) + CCTK_REAL, intent(out) :: dpdv2(npoints) + + ! local vars + integer :: i + character(256) :: warnstring + real*8 :: hybrid_local_gamma, hybrid_local_k_cgs, & + hybrid_p_poly, hybrid_p_th + real*8,parameter :: zero = 0.0d0 + + anyerr = 0 + keyerr(:) = 0 + + select case (eoskey) + case (1) + ! polytropic EOS + call CCTK_WARN(0,"Polytropic EOS not implemented for press_f_hro_v2_rhoW") + case (2) + ! gamma-law EOS + if(keytemp.eq.1) then + call CCTK_WARN(0,"keytemp.eq.1 not implemented for press_f_hro_v2_rhoW") + endif + do i=1,npoints + dpdv2(i) = (gl_gamma - 1.0d0) * (0.5d0 * rhoW(i) & + / sqrt(1.0d0 - v2(i)) - hrho(i)) / gl_gamma + enddo + case (3) + ! hybrid EOS + call CCTK_WARN(0,"Hybrid EOS not implemented for press_f_hro_v2_rhoW") + + case DEFAULT + write(warnstring,*) "eoskey ",eoskey," not implemented!" + call CCTK_WARN(0,warnstring) + end select + +end subroutine EOS_Omni_EOS_dpdv2_f_hrho_v2_rhoW + + File [modified]: make.code.defn Delta lines: +2 -1 =================================================================== --- EOS_Omni/src/make.code.defn 2010-08-18 18:41:07 UTC (rev 7) +++ EOS_Omni/src/make.code.defn 2010-08-26 19:26:54 UTC (rev 8) @@ -1,7 +1,8 @@ # Main make.code.defn file for thorn EOS_Omni # Source files in this directory -SRCS = EOS_Omni_Module.F90 EOS_Omni_Startup.F90 EOS_Omni_SingleVarCalls.F90 EOS_Omni_Handles.c +SRCS = EOS_Omni_Module.F90 EOS_Omni_Startup.F90 EOS_Omni_SingleVarCalls.F90 \ + EOS_Omni_SingleVarCalls_harm.F90 EOS_Omni_Handles.c # Subdirectories containing source files SUBDIRS =

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 150)
by knarf＠cct.lsu.edu 19 Aug '10

19 Aug '10

User: knarf Date: 2010/08/19 09:25 AM Modified: /trunk/src/ GRHydro_EOS.c Log: fix stupid typo File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_EOS.c Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_EOS.c 2010-08-18 18:41:48 UTC (rev 149) +++ trunk/src/GRHydro_EOS.c 2010-08-19 14:25:30 UTC (rev 150) @@ -53,7 +53,7 @@ #else if ((*GRHydro_eos_handle = EOS_Handle(GRHydro_eos_table)) < 0) CCTK_WARN(0, "Cannot get EOS handle, aborting."); - if ((*GRHydro_polytrope_handle = EOS_Handle("2D_Polytrope")) < 0); + if ((*GRHydro_polytrope_handle = EOS_Handle("2D_Polytrope")) < 0) CCTK_WARN(0, "Cannot get polytrope EOS handle, aborting."); CCTK_VInfo(CCTK_THORNSTRING, "GRHydro will use the %s equation of state.", GRHydro_eos_table);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits