Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 220)
by roland.haas＠physics.gatech.edu 02 Mar '11

02 Mar '11

User: rhaas Date: 2011/03/02 08:57 AM Modified: /trunk/src/ GRHydro_Reconstruct.F90, GRHydro_ReconstructM.F90, GRHydro_ReconstructPoly.F90, GRHydro_ReconstructPolyM.F90 Log: more OpenMP WORKSHARE sections in GRHydro Reconstruct multiple WORKSHARE sections are used since the standard does only seem to allow assignments and WHERE statements in WORKSHARE sections File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Reconstruct.F90 Delta lines: +24 -4 =================================================================== --- trunk/src/GRHydro_Reconstruct.F90 2011-02-26 20:50:58 UTC (rev 219) +++ trunk/src/GRHydro_Reconstruct.F90 2011-03-02 14:57:32 UTC (rev 220) @@ -105,24 +105,34 @@ ny = cctk_lsh(2) nz = cctk_lsh(3) + !$OMP PARALLEL + !$OMP WORKSHARE trivial_rp = .false. + !$OMP END WORKSHARE NOWAIT !!$ Currently only option is reconstruction on primitive variables. !!$ Should change this. + !$OMP WORKSHARE psi4 = 1.d0 + !$OMP END WORKSHARE NOWAIT if (shift_state .ne. 0) then + !$OMP WORKSHARE lbetax = betax lbetay = betay lbetaz = betaz + !$OMP END WORKSHARE NOWAIT else + !$OMP WORKSHARE lbetax = 0.d0 lbetay = 0.d0 lbetaz = 0.d0 + !$OMP END WORKSHARE NOWAIT end if !!$ Initialize variables that store reconstructed quantities + !$OMP WORKSHARE rhoplus = 0.0d0 rhominus = 0.0d0 epsplus = 0.0d0 @@ -133,29 +143,39 @@ velyminus = 0.0d0 velzplus = 0.0d0 velzminus = 0.0d0 + !$OMP END WORKSHARE NOWAIT if(evolve_mhd.ne.0) then + !$OMP WORKSHARE Bvecxplus = 0.0d0 Bvecxminus = 0.0d0 Bvecyplus = 0.0d0 Bvecyminus = 0.0d0 Bveczplus = 0.0d0 Bveczminus = 0.0d0 + !$OMP END WORKSHARE NOWAIT if(clean_divergence.ne.0) then + !$OMP WORKSHARE psidcplus = 0.0d0 psidcminus = 0.0d0 + !$OMP END WORKSHARE NOWAIT endif endif if (evolve_tracer .ne. 0) then + !$OMP WORKSHARE tracerplus = 0.0d0 tracerminus = 0.0d0 + !$OMP END WORKSHARE NOWAIT endif if (evolve_Y_e .ne. 0) then + !$OMP WORKSHARE Y_e_plus = 0.0d0 Y_e_minus = 0.0d0 + !$OMP END WORKSHARE NOWAIT endif + !$OMP END PARALLEL if (CCTK_EQUALS(recon_method,"tvd")) then @@ -819,7 +839,7 @@ deallocate(psi4, lbetax, lbetay, lbetaz) deallocate(dum,dump,dumm) - !$OMP WORKSHARE + !$OMP PARALLEL WORKSHARE where ( (rhoplus < GRHydro_rho_min).or.(rhominus < GRHydro_rho_min) ) rhoplus = rho rhominus = rho @@ -832,7 +852,7 @@ epsplus = eps epsminus = eps end where - !$OMP END WORKSHARE + !$OMP END PARALLEL WORKSHARE if (evolve_tracer .ne. 0) then if (use_min_tracer .ne. 0) then @@ -841,13 +861,13 @@ local_min_tracer = 0.0d0 end if - !$OMP WORKSHARE + !$OMP PARALLEL WORKSHARE where( (tracerplus .le. local_min_tracer).or.& (tracerminus .le. local_min_tracer) ) tracerplus = tracer tracerminus = tracer end where - !$OMP END WORKSHARE + !$OMP END PARALLEL WORKSHARE ! Call the conserved tracer routine in any case because (accord. to ! Christian Ott) this is the only way this works call Prim2ConservativeTracer(CCTK_PASS_FTOF) File [modified]: GRHydro_ReconstructM.F90 Delta lines: +4 -4 =================================================================== --- trunk/src/GRHydro_ReconstructM.F90 2011-02-26 20:50:58 UTC (rev 219) +++ trunk/src/GRHydro_ReconstructM.F90 2011-03-02 14:57:32 UTC (rev 220) @@ -629,7 +629,7 @@ deallocate(trivial_rp) deallocate(psi4, lbetax, lbetay, lbetaz) - !$OMP WORKSHARE + !$OMP PARALLEL WORKSHARE where ( (rhoplus < GRHydro_rho_min).or.(rhominus < GRHydro_rho_min).or.& (epsplus < 0.d0).or.(epsminus < 0.d0) ) rhoplus = rho @@ -650,7 +650,7 @@ !!$ Bveczminus = Bvec(:,:,:,3) end where - !$OMP END WORKSHARE + !$OMP END PARALLEL WORKSHARE if (evolve_tracer .ne. 0) then if (use_min_tracer .ne. 0) then @@ -659,13 +659,13 @@ local_min_tracer = 0d0 end if - !$OMP WORKSHARE + !$OMP PARALLEL WORKSHARE where( (tracerplus .le. local_min_tracer).or.& (tracerminus .le. local_min_tracer) ) tracerplus = tracer tracerminus = tracer end where - !$OMP END WORKSHARE + !$OMP END PARALLEL WORKSHARE ! Call the conserved tracer routine in any case because (accord. to ! Christian Ott) this is the only way this works File [modified]: GRHydro_ReconstructPoly.F90 Delta lines: +24 -4 =================================================================== --- trunk/src/GRHydro_ReconstructPoly.F90 2011-02-26 20:50:58 UTC (rev 219) +++ trunk/src/GRHydro_ReconstructPoly.F90 2011-03-02 14:57:32 UTC (rev 220) @@ -104,24 +104,34 @@ ny = cctk_lsh(2) nz = cctk_lsh(3) + !$OMP PARALLEL + !$OMP WORKSHARE trivial_rp = .false. + !$OMP END WORKSHARE NOWAIT !!$ Currently only option is reconstruction on primitive variables. !!$ Should change this. + !$OMP WORKSHARE psi4 = 1.0d0 + !$OMP END WORKSHARE NOWAIT if (shift_state .ne. 0) then + !$OMP WORKSHARE lbetax = betax lbetay = betay lbetaz = betaz + !$OMP END WORKSHARE NOWAIT else + !$OMP WORKSHARE lbetax = 0.d0 lbetay = 0.d0 lbetaz = 0.d0 + !$OMP END WORKSHARE NOWAIT end if !!$ Initialize variables that store reconstructed quantities + !$OMP WORKSHARE rhoplus = 0.0d0 rhominus = 0.0d0 epsplus = 0.0d0 @@ -132,28 +142,38 @@ velyminus = 0.0d0 velzplus = 0.0d0 velzminus = 0.0d0 + !$OMP END WORKSHARE NOWAIT if(evolve_mhd.ne.0) then + !$OMP WORKSHARE Bvecxplus = 0.0d0 Bvecxminus = 0.0d0 Bvecyplus = 0.0d0 Bvecyminus = 0.0d0 Bveczplus = 0.0d0 Bveczminus = 0.0d0 + !$OMP END WORKSHARE NOWAIT if(clean_divergence.ne.0) then + !$OMP WORKSHARE psidcplus = 0.0d0 psidcminus=0.0d0 + !$OMP END WORKSHARE NOWAIT endif endif if (evolve_tracer .ne. 0) then + !$OMP WORKSHARE tracerplus = 0.0d0 tracerminus = 0.0d0 + !$OMP END WORKSHARE NOWAIT endif if (evolve_Y_e .ne. 0) then + !$OMP WORKSHARE Y_e_plus = 0.0d0 Y_e_minus = 0.0d0 + !$OMP END WORKSHARE NOWAIT endif + !$OMP END PARALLEL if (CCTK_EQUALS(recon_method,"tvd")) then @@ -794,7 +814,7 @@ deallocate(psi4, lbetax, lbetay, lbetaz) deallocate(dum, dump, dumm) - !$OMP WORKSHARE + !$OMP PARALLEL WORKSHARE where ( (rhoplus < GRHydro_rho_min).or.(rhominus < GRHydro_rho_min).or.& (epsplus < 0.d0).or.(epsminus < 0.d0) ) rhoplus = rho @@ -808,7 +828,7 @@ epsplus = eps epsminus = eps end where - !$OMP END WORKSHARE + !$OMP END PARALLEL WORKSHARE if (evolve_tracer .ne. 0) then if (use_min_tracer .ne. 0) then @@ -817,13 +837,13 @@ local_min_tracer = 0d0 end if - !$OMP WORKSHARE + !$OMP PARALLEL WORKSHARE where( (tracerplus .le. local_min_tracer).or.& (tracerminus .le. local_min_tracer) ) tracerplus = tracer tracerminus = tracer end where - !$OMP END WORKSHARE + !$OMP END PARALLEL WORKSHARE ! Call the conserved tracer routine in any case because (accord. to ! Christian Ott) this is the only way this works call Prim2ConservativeTracer(CCTK_PASS_FTOF) File [modified]: GRHydro_ReconstructPolyM.F90 Delta lines: +4 -4 =================================================================== --- trunk/src/GRHydro_ReconstructPolyM.F90 2011-02-26 20:50:58 UTC (rev 219) +++ trunk/src/GRHydro_ReconstructPolyM.F90 2011-03-02 14:57:32 UTC (rev 220) @@ -607,7 +607,7 @@ deallocate(trivial_rp) deallocate(psi4, lbetax, lbetay, lbetaz) - !$OMP WORKSHARE + !$OMP PARALLEL WORKSHARE where ( (rhoplus < GRHydro_rho_min).or.(rhominus < GRHydro_rho_min).or.& (epsplus < 0.d0).or.(epsminus < 0.d0) ) rhoplus = rho @@ -628,7 +628,7 @@ !!$ Bveczminus = Bvec(:,:,:,3) end where - !$OMP END WORKSHARE + !$OMP END PARALLEL WORKSHARE if (evolve_tracer .ne. 0) then if (use_min_tracer .ne. 0) then @@ -637,13 +637,13 @@ local_min_tracer = 0d0 end if - !$OMP WORKSHARE + !$OMP PARALLEL WORKSHARE where( (tracerplus .le. local_min_tracer).or.& (tracerminus .le. local_min_tracer) ) tracerplus = tracer tracerminus = tracer end where - !$OMP END WORKSHARE + !$OMP END PARALLEL WORKSHARE ! Call the conserved tracer routine in any case because (accord. to ! Christian Ott) this is the only way this works !!$ No special call in MHD

1 0

[svn:einsteintoolkit] IDAnalyticBH/trunk/src/ (Rev. 178)
by bcmsma＠astro.rit.edu 28 Feb '11

28 Feb '11

User: bmundim Date: 2011/02/28 02:09 PM Modified: /trunk/src/ Kerr.c Log: Segfault with kerr initial data using IDAnalyticBH Yosef's patch: If initial_data=kerr and metric_type=physical, IDAnalyticBH writes to psi[x-z] and psi[x-z][x-z] (it tries to set these GFs to zero) even if no storage is allocated. The problem is with the code: IDAnalyticBH_zero_CCTK_REAL_array(npoints, psix); etc.., which is only executed when the metric is physical. I was able to use the Kerr data with this patch, but just deleting the offending lines should be sufficient. File Changes: Directory: /trunk/src/ ====================== File [modified]: Kerr.c Delta lines: +21 -9 =================================================================== --- trunk/src/Kerr.c 2010-11-21 03:29:37 UTC (rev 177) +++ trunk/src/Kerr.c 2011-02-28 20:09:09 UTC (rev 178) @@ -103,8 +103,13 @@ conformal_storage); /*NOTREACHED*/ } } + else + { + *conformal_state = 0; + } + /* printf("npoints: %i\n",npoints); */ for(i = 0; i < npoints; i++) { @@ -311,15 +316,22 @@ } IDAnalyticBH_zero_CCTK_REAL_array(npoints, gxz); IDAnalyticBH_zero_CCTK_REAL_array(npoints, gyz); - IDAnalyticBH_zero_CCTK_REAL_array(npoints, psix); - IDAnalyticBH_zero_CCTK_REAL_array(npoints, psiy); - IDAnalyticBH_zero_CCTK_REAL_array(npoints, psiz); - IDAnalyticBH_zero_CCTK_REAL_array(npoints, psixx); - IDAnalyticBH_zero_CCTK_REAL_array(npoints, psixy); - IDAnalyticBH_zero_CCTK_REAL_array(npoints, psixz); - IDAnalyticBH_zero_CCTK_REAL_array(npoints, psiyy); - IDAnalyticBH_zero_CCTK_REAL_array(npoints, psiyz); - IDAnalyticBH_zero_CCTK_REAL_array(npoints, psizz); + + if (psix && *conformal_state < 2) + { + IDAnalyticBH_zero_CCTK_REAL_array(npoints, psix); + IDAnalyticBH_zero_CCTK_REAL_array(npoints, psiy); + IDAnalyticBH_zero_CCTK_REAL_array(npoints, psiz); + } + if (psixx && *conformal_state < 3) + { + IDAnalyticBH_zero_CCTK_REAL_array(npoints, psixx); + IDAnalyticBH_zero_CCTK_REAL_array(npoints, psixy); + IDAnalyticBH_zero_CCTK_REAL_array(npoints, psixz); + IDAnalyticBH_zero_CCTK_REAL_array(npoints, psiyy); + IDAnalyticBH_zero_CCTK_REAL_array(npoints, psiyz); + IDAnalyticBH_zero_CCTK_REAL_array(npoints, psizz); + } } return;

1 0

[svn:einsteintoolkit] Paper_EinsteinToolkit_2010/ (Rev. 32)
by knarf＠cct.lsu.edu 28 Feb '11

28 Feb '11

User: knarf Date: 2011/02/28 09:42 AM Modified: / ET.tex Log: some equations File Changes: Directory: / ============ File [modified]: ET.tex Delta lines: +12 -4 =================================================================== --- ET.tex 2011-02-27 23:06:15 UTC (rev 31) +++ ET.tex 2011-02-28 15:42:55 UTC (rev 32) @@ -422,7 +422,6 @@ \subsection{Base Modules} \label{sec:base_modules} -\todo{1/3 page Frank} Modular designs have proven to be essential for distributed development of complex software systems, and require the use of well defined interfaces. Low-level interoperability within the Einstein Toolkit is provided by @@ -463,11 +462,20 @@ In particular, it defines the rest-mass density $\varrho$, the gas pressure $p$, internal energy density $\epsilon$, the contravariant gas three velocity defined as -$v^i = \frac{u^i}{\alpha u^0} + \frac{\beta^i}{\alpha}$, the electron +\begin{equation} + v^i = \frac{u^i}{\alpha u^0} + \frac{\beta^i}{\alpha} +\end{equation} +the electron fraction $Y_e$, the temperature $T$, the specific entropy per particle $s$ and the contravariant magnetic field vector $B^i$, defined -as $B^i = \frac{1}{\sqrt{4\pi}} n_{\nu} F^{*\nu i}$, in terms of the dual -$F^{*\mu\nu} = \frac{1}{2}\varepsilon^{\mu\nu\alpha\beta}F_{\alpha\beta}$ +as +\begin{equation} + B^i = \frac{1}{\sqrt{4\pi}} n_{\nu} F^{*\nu i} +\end{equation} +in terms of the dual +\begin{equation} + F^{*\mu\nu} = \frac{1}{2}\varepsilon^{\mu\nu\alpha\beta}F_{\alpha\beta} +\end{equation} to the Faraday tensor and the unit normal of the foliation of spacetime $n^\mu$.

1 0

[svn:einsteintoolkit] Paper_EinsteinToolkit_2010/examples/cosmology/ (Rev. 31)
by bentivegna＠einsteintoolkit.org 27 Feb '11

27 Feb '11

User: bentivegna Date: 2011/02/27 05:06 PM Modified: /examples/cosmology/ gowdy.par Log: Fixed a few details in gowdy.par. File Changes: Directory: /examples/cosmology/ =============================== File [modified]: gowdy.par Delta lines: +3 -3 =================================================================== --- examples/cosmology/gowdy.par 2011-02-15 14:31:53 UTC (rev 30) +++ examples/cosmology/gowdy.par 2011-02-27 23:06:15 UTC (rev 31) @@ -9,8 +9,8 @@ Cactus::cctk_timer_output = "full" Cactus::terminate = "time" -Cactus::cctk_initial_time = 1 -Cactus::cctk_final_time = 10.0 +Cactus::cctk_initial_time = 1.0 +Cactus::cctk_final_time = 2.0 ############################################################################################# ActiveThorns = "Boundary CartGrid3D CoordBase Slab SymBase Periodic" @@ -237,7 +237,7 @@ Activethorns = "CarpetIOHDF5" ################################# -IOHDF5::out_every = 1 +IOHDF5::out_every = 32 IOHDF5::one_file_per_group = yes IOHDF5::compression_level = 0 IOHDF5::out_vars = "

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 219)
by knarf＠cct.lsu.edu 26 Feb '11

26 Feb '11

User: knarf Date: 2011/02/26 02:51 PM Modified: /trunk/src/ GRHydro_Con2Prim.F90 Log: patch from Roland Haas: in Con2PrimGeneral inside a do File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2011-02-21 17:16:59 UTC (rev 218) +++ trunk/src/GRHydro_Con2Prim.F90 2011-02-26 20:50:58 UTC (rev 219) @@ -2086,7 +2086,7 @@ if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. & GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle - f = press_new(i,j,k) - press(i,j,k) + f(i,j,k) = press_new(i,j,k) - press(i,j,k) udens = dens(i,j,k) / sqrt(GRHydro_det(i,j,k)) usx = scon(i,j,k,1) / sqrt(GRHydro_det(i,j,k))

1 0

[svn:einsteintoolkit] Multipole/trunk/src/ (Rev. 75)
by ian.hinder＠aei.mpg.de 23 Feb '11

23 Feb '11

User: hinder Date: 2011/02/23 08:23 AM Modified: /trunk/src/ multipole.cc Log: Correct error check in CCTK_TraverseString Previously the code would abort if there were no variables to decompose File Changes: Directory: /trunk/src/ ====================== File [modified]: multipole.cc Delta lines: +1 -1 =================================================================== --- trunk/src/multipole.cc 2011-01-03 18:50:53 UTC (rev 74) +++ trunk/src/multipole.cc 2011-02-23 14:23:41 UTC (rev 75) @@ -89,7 +89,7 @@ vars.vars = v; int ierr = CCTK_TraverseString(var_string.c_str(), fill_variable, &vars, CCTK_GROUP_OR_VAR); - assert(ierr > 0); + assert(ierr >= 0); *n_variables = vars.n_vars; }

1 0

[svn:einsteintoolkit] HydroBase/trunk/ (Rev. 39)
by bcmsma＠astro.rit.edu 21 Feb '11

21 Feb '11

User: bmundim Date: 2011/02/21 01:13 PM Modified: /trunk/ interface.ccl Log: Lorentz factor tensor type alias fixed. File Changes: Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +1 -1 =================================================================== --- trunk/interface.ccl 2011-02-21 17:14:39 UTC (rev 38) +++ trunk/interface.ccl 2011-02-21 19:13:43 UTC (rev 39) @@ -35,7 +35,7 @@ CCTK_REAL vel[3] type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="U" interpolator="matter"' "velocity v^i" -CCTK_REAL w_lorentz type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="U" interpolator="matter"' "Lorentz Factor" +CCTK_REAL w_lorentz type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" interpolator="matter"' "Lorentz Factor" CCTK_REAL Y_e type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" interpolator="matter"' "Electron Fraction" CCTK_REAL temperature type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" interpolator="matter"' "Temperature [MeV]"

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 218)
by cott＠tapir.caltech.edu 21 Feb '11

21 Feb '11

User: cott Date: 2011/02/21 11:16 AM Modified: /trunk/ interface.ccl, schedule.ccl /trunk/src/ GRHydro_Boundaries.F90, GRHydro_BoundariesM.F90, GRHydro_Con2Prim.F90, GRHydro_Prim2Con.F90, GRHydro_RegisterGZ.cc, GRHydro_RegisterGZM.cc, GRHydro_RegisterVars.cc, GRHydro_RegisterVarsM.cc Log: * changes to go along with the move of the Lorentz factor variable from GRHydro to HydroBase File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Boundaries.F90 Delta lines: +3 -3 =================================================================== --- trunk/src/GRHydro_Boundaries.F90 2011-02-10 15:23:57 UTC (rev 217) +++ trunk/src/GRHydro_Boundaries.F90 2011-02-21 17:16:59 UTC (rev 218) @@ -64,7 +64,7 @@ call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::press") call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::dens") call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::tau") - call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::w_lorentz") + call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::w_lorentz") call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::eps") call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::GRHydro_C2P_failed") if(evolve_mhd.ne.0.and.clean_divergence.ne.0) then @@ -157,7 +157,7 @@ ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "GRHydro::scon", "Flat") ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "GRHydro::w_lorentz", "Flat") + "HydroBase::w_lorentz", "Flat") ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "HydroBase::rho", "Flat") ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & @@ -207,7 +207,7 @@ ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "GRHydro::scon", "None") ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "GRHydro::w_lorentz", "None") + "HydroBase::w_lorentz", "None") ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "HydroBase::rho", "None") ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & File [modified]: GRHydro_BoundariesM.F90 Delta lines: +3 -3 =================================================================== --- trunk/src/GRHydro_BoundariesM.F90 2011-02-10 15:23:57 UTC (rev 217) +++ trunk/src/GRHydro_BoundariesM.F90 2011-02-21 17:16:59 UTC (rev 218) @@ -64,7 +64,7 @@ call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::press") call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::dens") call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::tau") - call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::w_lorentz") + call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::w_lorentz") call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::eps") call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::GRHydro_C2P_failed") if(clean_divergence.ne.0) then @@ -152,7 +152,7 @@ ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "GRHydro::scon", "Flat") ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "GRHydro::w_lorentz", "Flat") + "HydroBase::w_lorentz", "Flat") ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "HydroBase::rho", "Flat") ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & @@ -192,7 +192,7 @@ ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "GRHydro::scon", "None") ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "GRHydro::w_lorentz", "None") + "HydroBase::w_lorentz", "None") ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "HydroBase::rho", "None") ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & File [modified]: GRHydro_Con2Prim.F90 Delta lines: +27 -0 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2011-02-10 15:23:57 UTC (rev 217) +++ trunk/src/GRHydro_Con2Prim.F90 2011-02-21 17:16:59 UTC (rev 218) @@ -561,6 +561,7 @@ ! error handling if(anyerr.ne.0) then if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then + !OMP CRITICAL call CCTK_WARN(failinfomode,"EOS error in c2p 0") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) @@ -569,6 +570,8 @@ write(warnline,"(A7,i8)") "code: ",keyerr(1) call CCTK_WARN(failinfomode,warnline) write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel + write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel + !OMP END CRITICAL if(keyerr(1).eq.667.and.GRHydro_eos_hot_eps_fix.ne.0) then ! Handling of the case when no new temperature can be ! found for a given epsilon. The amount of times @@ -582,11 +585,14 @@ rho,epsilon,temp,ye,xpress,keyerr,anyerr) nf = nf + 1 enddo + !OMP CRITICAL write(warnline,"(A30,i5)") "Iterations of heat injection: ",nf call CCTK_WARN(failinfomode,warnline) write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) + !OMP END CRITICAL if(nf.gt.nfudgemax) then + !OMP CRITICAL call CCTK_WARN(failinfomode,"EOS error in c2p 1: injected heat too many times") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) @@ -597,10 +603,13 @@ write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") + !OMP END CRITICAL endif else + !OMP CRITICAL call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") + !OMP END CRITICAL endif endif endif @@ -636,6 +645,7 @@ ! error handling if(anyerr.ne.0) then if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then + !OMP CRITICAL call CCTK_WARN(failinfomode,"EOS error in c2p 1") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) @@ -644,6 +654,8 @@ write(warnline,"(A7,i8)") "code: ",keyerr(1) call CCTK_WARN(failinfomode,warnline) write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel + call CCTK_WARN(failinfomode,warnline) + !OMP END CRITICAL if(keyerr(1).eq.667.and.GRHydro_eos_hot_eps_fix.ne.0) then ! Handling of the case when no new temperature can be ! found for a given epsilon. The amount of times @@ -657,11 +669,14 @@ rho,epsilon,temp,ye,xpress,keyerr,anyerr) nf = nf + 1 enddo + !OMP CRITICAL write(warnline,"(A30,i5)") "Iterations of heat injection: ",nf call CCTK_WARN(failinfomode,warnline) write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) + !OMP END CRITICAL if(nf.gt.nfudgemax) then + !OMP CRITICAL call CCTK_WARN(failinfomode,"EOS error in c2p 1: injected heat too many times") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) @@ -672,10 +687,13 @@ write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") + !OMP END CRITICAL endif else + !OMP CRITICAL call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") + !OMP END CRITICAL endif endif endif @@ -729,6 +747,7 @@ ! error handling if(anyerr.ne.0) then if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then + !OMP CRITICAL call CCTK_WARN(failinfomode,"EOS error in c2p 2") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) @@ -737,6 +756,8 @@ write(warnline,"(A7,i8)") "code: ",keyerr(1) call CCTK_WARN(failinfomode,warnline) write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel + call CCTK_WARN(failinfomode,warnline) + !OMP END CRITICAL if(keyerr(1).eq.667.and.GRHydro_eos_hot_eps_fix.ne.0) then ! Handling of the case when no new temperature can be ! found for a given epsilon. The amount of times @@ -750,11 +771,14 @@ rho,epsilon,temp,ye,xpress,keyerr,anyerr) nf = nf + 1 enddo + !OMP CRITICAL write(warnline,"(A30,i5)") "Iterations of heat injection: ",nf call CCTK_WARN(failinfomode,warnline) write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) + !OMP END CRITICAL if(nf.gt.nfudgemax) then + !OMP CRITICAL call CCTK_WARN(failinfomode,"EOS error in c2p 1: injected heat too many times") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) @@ -765,10 +789,13 @@ write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") + !OMP END CRITICAL endif else + !OMP CRITICAL call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") + !OMP END CRITICAL endif endif endif File [modified]: GRHydro_Prim2Con.F90 Delta lines: +4 -2 =================================================================== --- trunk/src/GRHydro_Prim2Con.F90 2011-02-10 15:23:57 UTC (rev 217) +++ trunk/src/GRHydro_Prim2Con.F90 2011-02-21 17:16:59 UTC (rev 218) @@ -269,7 +269,8 @@ ! This is a way of recovering even on finer refinement levels: ! Use the average temperature at the interface instead of the ! reconstructed specific internal energy. - !OMP CRITICAL +!! !OMP CRITICAL +#if 0 call CCTK_WARN(1,"EOS error in prim2con_hot: NOW using averaged temp!") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(1,warnline) @@ -279,7 +280,8 @@ call CCTK_WARN(1,warnline) write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(1,warnline) - !OMP END CRITICAL +#endif +!!! !OMP END CRITICAL keytemp=1 temp = temp0 call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& File [modified]: GRHydro_RegisterGZ.cc Delta lines: +6 -6 =================================================================== --- trunk/src/GRHydro_RegisterGZ.cc 2011-02-10 15:23:57 UTC (rev 217) +++ trunk/src/GRHydro_RegisterGZ.cc 2011-02-21 17:16:59 UTC (rev 218) @@ -39,7 +39,7 @@ if(clean_divergence) { string var[10] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps", "HydroBase::vel", - "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz", + "GRHydro::dens", "GRHydro::tau", "HydroBase::w_lorentz", "GRHydro::scon", "HydroBase::Bvec", "GRHydro::psidc"}; for (int i = 0; i < 10; i++) { @@ -58,7 +58,7 @@ } else { string var[9] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps", "HydroBase::vel", - "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz", + "GRHydro::dens", "GRHydro::tau", "HydroBase::w_lorentz", "GRHydro::scon", "HydroBase::Bvec"}; for (int i = 0; i < 9; i++) { @@ -78,7 +78,7 @@ } else { string var[8] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps", "HydroBase::vel", - "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz", + "GRHydro::dens", "GRHydro::tau", "HydroBase::w_lorentz", "GRHydro::scon"}; for (int i = 0; i < 8; i++) { @@ -110,7 +110,7 @@ if(clean_divergence) { string var[13] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps", "HydroBase::vel", - "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz", + "GRHydro::dens", "GRHydro::tau", "HydroBase::w_lorentz", "GRHydro::scon", "HydroBase::Bvec", "GRHydro::psidc", "ADMBase::metric", "ADMBase::curv", "ADMBase::shift"}; for (int i = 0; i < 13; i++) @@ -131,7 +131,7 @@ } else { string var[12] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps", "HydroBase::vel", - "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz", + "GRHydro::dens", "GRHydro::tau", "HydroBase::w_lorentz", "GRHydro::scon", "HydroBase::Bvec", "ADMBase::metric", "ADMBase::curv", "ADMBase::shift"}; for (int i = 0; i < 12; i++) @@ -154,7 +154,7 @@ } else { string var[11] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps", "HydroBase::vel", - "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz", + "GRHydro::dens", "GRHydro::tau", "HydroBase::w_lorentz", "GRHydro::scon", "ADMBase::metric", "ADMBase::curv", "ADMBase::shift"}; for (int i = 0; i < 11; i++) File [modified]: GRHydro_RegisterGZM.cc Delta lines: +4 -4 =================================================================== --- trunk/src/GRHydro_RegisterGZM.cc 2011-02-10 15:23:57 UTC (rev 217) +++ trunk/src/GRHydro_RegisterGZM.cc 2011-02-21 17:16:59 UTC (rev 218) @@ -38,7 +38,7 @@ if(clean_divergence) { string var[10] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps", "HydroBase::vel", - "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz", + "GRHydro::dens", "GRHydro::tau", "HydroBase::w_lorentz", "GRHydro::scon", "HydroBase::Bvec", "GRHydro::psidc"}; for (int i = 0; i < 10; i++) { @@ -57,7 +57,7 @@ } else { string var[9] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps", "HydroBase::vel", - "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz", + "GRHydro::dens", "GRHydro::tau", "HydroBase::w_lorentz", "GRHydro::scon", "HydroBase::Bvec"}; for (int i = 0; i < 9; i++) { @@ -89,7 +89,7 @@ if(clean_divergence) { string var[13] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps", "HydroBase::vel", - "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz", + "GRHydro::dens", "GRHydro::tau", "HydroBase::w_lorentz", "GRHydro::scon", "HydroBase::Bvec", "GRHydro::psidc", "ADMBase::metric", "ADMBase::curv", "ADMBase::shift"}; for (int i = 0; i < 13; i++) @@ -110,7 +110,7 @@ } else { string var[12] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps", "HydroBase::vel", - "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz", + "GRHydro::dens", "GRHydro::tau", "HydroBase::w_lorentz", "GRHydro::scon", "HydroBase::Bvec", "ADMBase::metric", "ADMBase::curv", "ADMBase::shift"}; for (int i = 0; i < 12; i++) File [modified]: GRHydro_RegisterVars.cc Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_RegisterVars.cc 2011-02-10 15:23:57 UTC (rev 217) +++ trunk/src/GRHydro_RegisterVars.cc 2011-02-21 17:16:59 UTC (rev 218) @@ -54,7 +54,7 @@ register_constrained("HydroBase::press"); register_constrained("HydroBase::eps"); register_constrained("HydroBase::vel"); - register_constrained("GRHydro::w_lorentz"); + register_constrained("HydroBase::w_lorentz"); if (CCTK_EQUALS(evolution_method, "GRHydro")) { File [modified]: GRHydro_RegisterVarsM.cc Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_RegisterVarsM.cc 2011-02-10 15:23:57 UTC (rev 217) +++ trunk/src/GRHydro_RegisterVarsM.cc 2011-02-21 17:16:59 UTC (rev 218) @@ -54,7 +54,7 @@ register_constrained("HydroBase::press"); register_constrained("HydroBase::eps"); register_constrained("HydroBase::vel"); - register_constrained("GRHydro::w_lorentz"); + register_constrained("HydroBase::w_lorentz"); if (CCTK_EQUALS(evolution_method, "GRHydro")) { Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +1 -1 =================================================================== --- trunk/interface.ccl 2011-02-10 15:23:57 UTC (rev 217) +++ trunk/interface.ccl 2011-02-21 17:16:59 UTC (rev 218) @@ -345,7 +345,7 @@ tracer } "Tracers" -real w_lorentz type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" tensorweight=+1.0 interpolator="matter"' "Lorentz factor" +#real w_lorentz type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" tensorweight=+1.0 interpolator="matter"' "Lorentz factor" real psidc type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" tensorweight=+1.0 interpolator="matter"' "Psi parameter for divergence cleaning" File [modified]: schedule.ccl Delta lines: +2 -4 =================================================================== --- trunk/schedule.ccl 2011-02-10 15:23:57 UTC (rev 217) +++ trunk/schedule.ccl 2011-02-21 17:16:59 UTC (rev 218) @@ -16,7 +16,6 @@ STORAGE:dens[3] STORAGE:tau[3] STORAGE:scon[3] - STORAGE:w_lorentz[3] if (number_of_particles) { STORAGE:particles[3] @@ -42,7 +41,6 @@ STORAGE:dens[2] STORAGE:tau[2] STORAGE:scon[2] - STORAGE:w_lorentz[2] if (number_of_particles) { STORAGE:particles[2] @@ -375,7 +373,7 @@ SYNC: dens SYNC: tau SYNC: scon - SYNC: w_lorentz + SYNC: hydrobase::w_lorentz SYNC: hydrobase::rho SYNC: hydrobase::press SYNC: hydrobase::eps @@ -1024,7 +1022,7 @@ SYNC: dens SYNC: tau SYNC: scon - SYNC: w_lorentz + SYNC: HydroBase::w_lorentz SYNC: HydroBase::rho SYNC: HydroBase::press SYNC: HydroBase::eps

1 0

[svn:einsteintoolkit] HydroBase/trunk/ (Rev. 38)
by cott＠tapir.caltech.edu 21 Feb '11

21 Feb '11

User: cott Date: 2011/02/21 11:14 AM Modified: /trunk/ interface.ccl, schedule.ccl Log: * add variable w_lorentz for the Lorentz factor File Changes: Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +2 -0 =================================================================== --- trunk/interface.ccl 2011-02-21 15:49:06 UTC (rev 37) +++ trunk/interface.ccl 2011-02-21 17:14:39 UTC (rev 38) @@ -35,6 +35,8 @@ CCTK_REAL vel[3] type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="U" interpolator="matter"' "velocity v^i" +CCTK_REAL w_lorentz type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="U" interpolator="matter"' "Lorentz Factor" + CCTK_REAL Y_e type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" interpolator="matter"' "Electron Fraction" CCTK_REAL temperature type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" interpolator="matter"' "Temperature [MeV]" CCTK_REAL entropy type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" interpolator="matter"' "Specific Entropy [k_b/baryon]" File [modified]: schedule.ccl Delta lines: +3 -0 =================================================================== --- trunk/schedule.ccl 2011-02-21 15:49:06 UTC (rev 37) +++ trunk/schedule.ccl 2011-02-21 17:14:39 UTC (rev 38) @@ -6,6 +6,7 @@ STORAGE: press[1] STORAGE: eps[1] STORAGE: vel[1] + STORAGE: w_lorentz[1] if (!CCTK_EQUALS(initial_Y_e, "none")) { STORAGE: Y_e[1] @@ -29,6 +30,7 @@ STORAGE: press[2] STORAGE: eps[2] STORAGE: vel[2] + STORAGE: w_lorentz[2] if (!CCTK_EQUALS(initial_Y_e, "none")) { STORAGE: Y_e[2] @@ -52,6 +54,7 @@ STORAGE: press[3] STORAGE: eps[3] STORAGE: vel[3] + STORAGE: w_lorentz[3] if (!CCTK_EQUALS(initial_Y_e, "none")) { STORAGE: Y_e[3]

1 0

[svn:einsteintoolkit] HydroBase/trunk/src/ (Rev. 37)
by roland.haas＠physics.gatech.edu 21 Feb '11

21 Feb '11

User: rhaas Date: 2011/02/21 09:49 AM Modified: /trunk/src/ StartUp.c Log: declare argument list of HydroBase_StartUp as (void) otherwise C (both C89 and C99) assume that it is as being and old K&R style function definition (C differs from C++ here) File Changes: Directory: /trunk/src/ ====================== File [modified]: StartUp.c Delta lines: +1 -1 =================================================================== --- trunk/src/StartUp.c 2011-02-04 14:23:52 UTC (rev 36) +++ trunk/src/StartUp.c 2011-02-21 15:49:06 UTC (rev 37) @@ -1,6 +1,6 @@ #include <cctk.h> -int HydroBase_StartUp() +int HydroBase_StartUp(void) { CCTK_RegisterBanner("HydroBase: Let it flow.");

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits