User: knarf Date: 2010/11/26 02:02 PM

Removed: /trunk/ configuration.ccl.omni, interface.ccl.omni, param.ccl.omni /trunk/test/ GRHydro_test_tov_ppm_ML_eos_omni.par, GRHydro_test_tov_ppm_eosg.par, GRHydro_test_tov_ppm_eosg_ML.par /trunk/test/GRHydro_test_tov_ppm_ML_eos_omni/ /trunk/test/GRHydro_test_tov_ppm_eosg/ /trunk/test/GRHydro_test_tov_ppm_eosg_ML/

Modified: /trunk/ configuration.ccl, interface.ccl, param.ccl, schedule.ccl /trunk/src/ GRHydro_Boundaries.F90, GRHydro_BoundariesM.F90, GRHydro_CalcUpdate.F90, GRHydro_CalcUpdateM.F90, GRHydro_Con2Prim.F90, GRHydro_Con2PrimM.F90, GRHydro_EOS.c, GRHydro_Eigenproblem.F90, GRHydro_EigenproblemM.F90, GRHydro_Eigenproblem_Marquina.F90, GRHydro_EoSChangeGamma.F90, GRHydro_HLLE.F90, GRHydro_HLLEM.F90, GRHydro_HLLEPoly.F90, GRHydro_HLLEPolyM.F90, GRHydro_Loop.F90, GRHydro_Marquina.F90, GRHydro_PPM.F90, GRHydro_ParamCheck.F90, GRHydro_ParamCheckM.F90, GRHydro_PreLoop.F90, GRHydro_Prim2Con.F90, GRHydro_Prim2ConM.F90, GRHydro_Reconstruct.F90, GRHydro_ReconstructM.F90, GRHydro_ReconstructPoly.F90, GRHydro_ReconstructPolyM.F90, GRHydro_RegisterVars.cc, GRHydro_RegisterVarsM.cc, GRHydro_RiemannSolve.F90, GRHydro_Source.F90, GRHydro_SourceM.F90, GRHydro_UpdateMask.F90, GRHydro_UpdateMaskM.F90, Utils.F90 /trunk/test/ GRHydro_test_shock.par, GRHydro_test_shock_ppm.par, GRHydro_test_tov_ppm.par, GRHydro_test_tov_ppm_ML.par, GRHydro_test_tov_ppm_ML_disable_internal_excision.par, GRHydro_test_tov_ppm_disable_internal_excision.par, GRHydro_test_tov_ppm_no_trp.par, GRHydro_test_tov_ppm_no_trp_ML.par

Log: merge branch hot_and_MHD_temp_dev into branch at revision r185

File Changes:

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

File [modified]: GRHydro_Boundaries.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_BoundariesM.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_CalcUpdate.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_CalcUpdateM.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_Con2Prim.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_Con2PrimM.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_EOS.c Delta lines: <Unavailable>

File [modified]: GRHydro_Eigenproblem.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_EigenproblemM.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_Eigenproblem_Marquina.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_EoSChangeGamma.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_HLLE.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_HLLEM.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_HLLEPoly.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_HLLEPolyM.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_Loop.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_ParamCheckM.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_PreLoop.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_Prim2Con.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_Prim2ConM.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_Reconstruct.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_ReconstructM.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_ReconstructPoly.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_ReconstructPolyM.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_RegisterVars.cc Delta lines: <Unavailable>

File [modified]: GRHydro_RegisterVarsM.cc Delta lines: <Unavailable>

File [modified]: GRHydro_RiemannSolve.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_Source.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_SourceM.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_UpdateMask.F90 Delta lines: <Unavailable>

File [modified]: GRHydro_UpdateMaskM.F90 Delta lines: <Unavailable>

File [modified]: Utils.F90 Delta lines: <Unavailable>

Directory: /trunk/test/ =======================

File [modified]: GRHydro_test_shock.par Delta lines: <Unavailable>

File [modified]: GRHydro_test_shock_ppm.par Delta lines: <Unavailable>

File [modified]: GRHydro_test_tov_ppm.par Delta lines: <Unavailable>

File [modified]: GRHydro_test_tov_ppm_ML.par Delta lines: <Unavailable>

File [modified]: GRHydro_test_tov_ppm_ML_disable_internal_excision.par Delta lines: <Unavailable>

File [removed]: GRHydro_test_tov_ppm_ML_eos_omni.par Delta lines: <Unavailable>

File [modified]: GRHydro_test_tov_ppm_disable_internal_excision.par Delta lines: <Unavailable>

File [removed]: GRHydro_test_tov_ppm_eosg.par Delta lines: <Unavailable>

File [removed]: GRHydro_test_tov_ppm_eosg_ML.par Delta lines: <Unavailable>

File [modified]: GRHydro_test_tov_ppm_no_trp.par Delta lines: <Unavailable>

File [modified]: GRHydro_test_tov_ppm_no_trp_ML.par Delta lines: <Unavailable>

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

File [modified]: configuration.ccl Delta lines: <Unavailable>

File [removed]: configuration.ccl.omni Delta lines: <Unavailable>

File [modified]: interface.ccl Delta lines: <Unavailable>

File [removed]: interface.ccl.omni Delta lines: <Unavailable>

File [modified]: param.ccl Delta lines: <Unavailable>

File [removed]: param.ccl.omni Delta lines: <Unavailable>

File [modified]: schedule.ccl Delta lines: <Unavailable>