User: knarf Date: 2010/04/22 05:26 PM

Modified: /trunk/src/ Whisky_Startup.F90

Log: replace thorn names, testsuites pass now

File Changes:

Directory: /trunk/src/ ======================

File [modified]: Whisky_Startup.F90 Delta lines: +14 -14 =================================================================== --- trunk/src/Whisky_Startup.F90 2010-04-22 22:02:01 UTC (rev 109) +++ trunk/src/Whisky_Startup.F90 2010-04-22 22:26:46 UTC (rev 110) @@ -103,8 +103,8 @@ call CCTK_VarIndex(indep_gfs(2), "whisky::epsplus") end if call CCTK_VarIndex(dep_gfs(1), "whisky::pressplus") - call CCTK_VarIndex(dep_gfs(2), "whisky::eos_dpdeps_p") - call CCTK_VarIndex(dep_gfs(3), "whisky::eos_cs2_p") + call CCTK_VarIndex(dep_gfs(2), "GRHydro::eos_dpdeps_p") + call CCTK_VarIndex(dep_gfs(3), "GRHydro::eos_cs2_p")

call CCTK_FortranString(strlen, eosgeneral_indep_plus_gfs, var_gfs) var_gfs = trim(var_gfs) @@ -148,8 +148,8 @@ call CCTK_VarIndex(indep_gfs(2), "whisky::epsminus") end if call CCTK_VarIndex(dep_gfs(1), "whisky::pressminus") - call CCTK_VarIndex(dep_gfs(2), "whisky::eos_dpdeps_m") - call CCTK_VarIndex(dep_gfs(3), "whisky::eos_cs2_m") + call CCTK_VarIndex(dep_gfs(2), "GRHydro::eos_dpdeps_m") + call CCTK_VarIndex(dep_gfs(3), "GRHydro::eos_cs2_m")

call CCTK_FortranString(strlen, eosgeneral_indep_minus_gfs, var_gfs) var_gfs = trim(var_gfs) @@ -186,14 +186,14 @@ !!$ Third, the "Average" state for the Roe solver

if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then - call CCTK_VarIndex(indep_gfs(1), "whisky::rho_ave") + call CCTK_VarIndex(indep_gfs(1), "GRHydro::rho_ave") else - call CCTK_VarIndex(indep_gfs(1), "whisky::rho_ave") - call CCTK_VarIndex(indep_gfs(2), "whisky::eps_ave") + call CCTK_VarIndex(indep_gfs(1), "GRHydro::rho_ave") + call CCTK_VarIndex(indep_gfs(2), "GRHydro::eps_ave") end if - call CCTK_VarIndex(dep_gfs(1), "whisky::press_ave") - call CCTK_VarIndex(dep_gfs(2), "whisky::eos_dpdeps_ave") - call CCTK_VarIndex(dep_gfs(3), "whisky::eos_cs2_ave") + call CCTK_VarIndex(dep_gfs(1), "GRHydro::press_ave") + call CCTK_VarIndex(dep_gfs(2), "GRHydro::eos_dpdeps_ave") + call CCTK_VarIndex(dep_gfs(3), "GRHydro::eos_cs2_ave")

call CCTK_FortranString(strlen, eosgeneral_indep_gfs, var_gfs) var_gfs = trim(var_gfs) @@ -236,8 +236,8 @@ "Pressure DPressureDSpecificInternalEnergy DPressureDRho SpecificInternalEnergy", & "Dependent variable names") call CCTK_VarIndex(dep_gfs(1), "HydroBase::press") - call CCTK_VarIndex(dep_gfs(2), "whisky::eos_dpdeps_temp") - call CCTK_VarIndex(dep_gfs(3), "whisky::eos_dpdrho_temp") + call CCTK_VarIndex(dep_gfs(2), "GRHydro::eos_dpdeps_temp") + call CCTK_VarIndex(dep_gfs(3), "GRHydro::eos_dpdrho_temp") call CCTK_VarIndex(dep_gfs(4), "HydroBase::eps") else call CCTK_VarIndex(indep_gfs(1), "HydroBase::rho") @@ -246,8 +246,8 @@ "Pressure DPressureDSpecificInternalEnergy DPressureDRho", & "Dependent variable names") call CCTK_VarIndex(dep_gfs(1), "HydroBase::press") - call CCTK_VarIndex(dep_gfs(2), "whisky::eos_dpdeps_temp") - call CCTK_VarIndex(dep_gfs(3), "whisky::eos_dpdrho_temp") + call CCTK_VarIndex(dep_gfs(2), "GRHydro::eos_dpdeps_temp") + call CCTK_VarIndex(dep_gfs(3), "GRHydro::eos_dpdrho_temp") end if

if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then