Commits March 2011

commits@lists.einsteintoolkit.org

6 participants
48 discussions

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 221)
by cott＠tapir.caltech.edu 11 Mar '11

11 Mar '11

User: cott Date: 2011/03/11 09:16 PM Modified: /trunk/src/ GRHydro_Con2Prim.F90 Log: * fix OMP bug in _hot part of c2p File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +20 -31 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2011-03-02 14:57:32 UTC (rev 220) +++ trunk/src/GRHydro_Con2Prim.F90 2011-03-12 03:16:20 UTC (rev 221) @@ -179,6 +179,7 @@ z(i,j,k),r(i,j,k),epsnegative,GRHydro_rho_min,pmin, epsmin, & GRHydro_reflevel, GRHydro_C2P_failed(i,j,k), local_perc_ptol) if(GRHydro_C2P_failed(i,j,k).eq.2) then + !$OMP CRITICAL(c2po1) if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then call CCTK_WARN(1,"Convergence problem in c2p") write(warnline,"(A10,i5)") "reflevel: ",GRHydro_reflevel @@ -190,6 +191,7 @@ call CCTK_WARN(1,warnline) call CCTK_WARN(0,"Aborting!!!") endif + !$OMP END CRITICAL(c2po1) endif endif endif @@ -525,7 +527,7 @@ integer :: nfudgemax,nf n=1;keytemp=0;anyerr=0;keyerr(1)=0 temp0 = 0.0d0;xpress = 0.0d0 - nf=0;nfudgemax=10 + nf=0;nfudgemax=15 ! end EOS Omni vars failinfomode = 1 @@ -536,11 +538,12 @@ epsminl = 1.0e-5 if(con2prim_oct_hack.ne.0.and.& - x .lt. 0.0d0 .or.& - y .lt. 0.0d0 .or.& - z .lt. 0.0d0) then - failwarnmode = 2 - failinfomode = 2 + (x .lt. -1.0d-12 .or.& + y .lt. -1.0d-12 .or.& + z .lt. -1.0d-12)) then + return +! failwarnmode = 2 +! failinfomode = 2 endif !!$ Undensitize the variables @@ -560,8 +563,8 @@ pold = max(1.d-15,xpress) ! error handling if(anyerr.ne.0) then + !$OMP CRITICAL(c2p0) 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) @@ -570,8 +573,7 @@ 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 + call CCTK_WARN(failinfomode,warnline) 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 @@ -585,14 +587,11 @@ 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) @@ -603,15 +602,14 @@ 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 + !$OMP END CRITICAL(c2p0) endif !!$ Check that the variables have a chance of being physical @@ -644,8 +642,8 @@ rho,epsilon,temp,ye,xpress,keyerr,anyerr) ! error handling if(anyerr.ne.0) then + !$OMP CRITICAL(c2p1) 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) @@ -655,7 +653,6 @@ 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 @@ -669,14 +666,11 @@ 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) @@ -687,15 +681,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 + !$OMP END CRITICAL(c2p1) endif f = pold - xpress @@ -746,8 +738,8 @@ rho,epsilon,temp,ye,xpress,keyerr,anyerr) ! error handling if(anyerr.ne.0) then + !$OMP CRITICAL(c2p2) 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) @@ -757,7 +749,6 @@ 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 @@ -771,14 +762,11 @@ 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) @@ -789,15 +777,14 @@ 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 + !$OMP END CRITICAL(c2p2) endif f = pnew - xpress @@ -836,6 +823,7 @@ ! error handling if(anyerr.ne.0) then + !$OMP CRITICAL(c2p3) if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then call CCTK_WARN(failinfomode,"EOS error in c2p 3") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z @@ -848,6 +836,7 @@ call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") endif + !$OMP END CRITICAL(c2p3) endif f = pold - xpress

1 0

[svn:einsteintoolkit] www/about/members/ (Rev. 465)
by knarf＠cct.lsu.edu 09 Mar '11

09 Mar '11

User: knarf Date: 2011/03/09 10:11 AM Modified: /about/members/ members.txt Log: add Peter Kalmus File Changes: Directory: /about/members/ ========================== File [modified]: members.txt Delta lines: +1 -0 =================================================================== --- about/members/members.txt 2011-03-04 17:30:29 UTC (rev 464) +++ about/members/members.txt 2011-03-09 16:11:15 UTC (rev 465) @@ -18,6 +18,7 @@ http://www.tapir.caltech.edu/ California Institute of Technology http://www.tapir.caltech.edu/~cott/ Christian D. Ott + Peter Kalmus Christian Reisswig BÃ©la SzilÃ¡gyi

1 0

[svn:einsteintoolkit] IDAnalyticBH/trunk/src/ (Rev. 179)
by schnetter＠cct.lsu.edu 08 Mar '11

08 Mar '11

User: eschnett Date: 2011/03/08 11:04 AM Modified: /trunk/src/ Kerr.c Log: The Kerr initial data (in EinsteinInitialData?/IDAnalyticBH/src/Kerr.c) has a defect along the z-axis (that is, the spin axis of the hole). The three-metric (for instance) is not smooth across this axis, leading to discontinuities in second spatial derivatives near there. This appears to be due to overly crude safety measures protecting from division by zero when calculating this data. Tweaking these measures for more self-consistency leads to much smoother behaviour. I'm attaching a simple patch that fixes the problem at least for metric_type = physical. [Patch from Bernard Kelly] File Changes: Directory: /trunk/src/ ====================== File [modified]: Kerr.c Delta lines: +5 -1 =================================================================== --- trunk/src/Kerr.c 2011-02-28 20:09:09 UTC (rev 178) +++ trunk/src/Kerr.c 2011-03-08 17:04:33 UTC (rev 179) @@ -117,8 +117,12 @@ /* Define coordinate functions */ xx=x[i]; yy=y[i]; zz=z[i]; rho_2=xx*xx+yy*yy; - if (rho_2<epsilon) rho_2=epsilon; rho=sqrt(rho_2); + if (rho<epsilon) { + xx=epsilon; + rho_2=xx*xx+yy*yy; + rho=sqrt(rho_2); + } R_2=rho_2+zz*zz; R=sqrt(R_2); R_3=R*R_2;

1 0

[svn:einsteintoolkit] Paper_EinsteinToolkit_2010/ (Rev. 33)
by knarf＠cct.lsu.edu 07 Mar '11

07 Mar '11

User: knarf Date: 2011/03/07 09:53 AM Added: /examples/tov/ tov.rpar Log: tov parameter file generator Directory Changes: Directory: /svn:executable/ =========================== + * File Changes: Directory: /examples/tov/ ========================= File [added]: tov.rpar Delta lines: +239 -0 =================================================================== --- examples/tov/tov.rpar (rev 0) +++ examples/tov/tov.rpar 2011-03-07 15:53:14 UTC (rev 33) @@ -0,0 +1,239 @@ +#!/usr/bin/perl -w +use strict; + +foreach my $res ((8, 4, 2)) { + + my $out_every = 256/$res; + my $par = <<PAR_EOF; +## mclachlan tov_static +ActiveThorns = "Time MoL" +ActiveThorns = "Coordbase CartGrid3d Boundary StaticConformal" +ActiveThorns = "SymBase ADMBase TmunuBase HydroBase InitBase ADMCoupling ADMMacros" +ActiveThorns = "IOUtil" +#ActiveThorns = "Formaline" +ActiveThorns = "SpaceMask CoordGauge Constants LocalReduce aeilocalinterp LoopControl" +ActiveThorns = "Carpet CarpetLib CarpetReduce CarpetRegrid2 CarpetInterp" +ActiveThorns = "CarpetIOASCII CarpetIOScalar CarpetIOHDF5 CarpetIOBasic" + +ActiveThorns = "ADMConstraints" + +# grid parameters +CartGrid3D::type = "coordbase" +CartGrid3D::domain = "full" +CartGrid3D::avoid_origin = "no" +CoordBase::xmin = 0.0 +CoordBase::ymin = 0.0 +CoordBase::zmin = 0.0 +CoordBase::xmax = 240.0 +CoordBase::ymax = 240.0 +CoordBase::zmax = 240.0 +CoordBase::dx = $res +CoordBase::dy = $res +CoordBase::dz = $res + +CoordBase::boundary_size_x_lower = 3 +CoordBase::boundary_size_y_lower = 3 +CoordBase::boundary_size_z_lower = 3 +CoordBase::boundary_size_x_upper = 3 +CoordBase::boundary_size_y_upper = 3 +CoordBase::boundary_size_z_upper = 3 +CoordBase::boundary_shiftout_x_lower = 1 +CoordBase::boundary_shiftout_y_lower = 1 +CoordBase::boundary_shiftout_z_lower = 1 +CoordBase::boundary_shiftout_x_upper = 0 +CoordBase::boundary_shiftout_y_upper = 0 +CoordBase::boundary_shiftout_z_upper = 0 + + + + +ActiveThorns = "ReflectionSymmetry" + +ReflectionSymmetry::reflection_x = "yes" +ReflectionSymmetry::reflection_y = "yes" +ReflectionSymmetry::reflection_z = "yes" +ReflectionSymmetry::avoid_origin_x = "no" +ReflectionSymmetry::avoid_origin_y = "no" +ReflectionSymmetry::avoid_origin_z = "no" + + + +TmunuBase::stress_energy_storage = yes +TmunuBase::stress_energy_at_RHS = yes +TmunuBase::timelevels = 1 +TmunuBase::prolongation_type = none + +HydroBase::timelevels = 3 + +ADMMacros::spatial_order = 4 + +ADMBase::metric_type = "physical" + +ADMConstraints::bound = "static" +ADMConstraints::constraints_timelevels = 3 +ADMConstraints::constraints_persist = yes + +SpaceMask::use_mask = "yes" + +Cactus::terminate = "time" +Cactus::cctk_final_time = 1000 + +Carpet::domain_from_coordbase = "yes" +Carpet::enable_all_storage = no +Carpet::use_buffer_zones = "yes" + +Carpet::poison_new_timelevels = "yes" +Carpet::check_for_poison = "no" +Carpet::poison_value = 113 + +Carpet::init_3_timelevels = no +Carpet::init_fill_timelevels = "yes" + +CarpetLib::poison_new_memory = "yes" +CarpetLib::poison_value = 114 + +# system specific Carpet paramters +Carpet::max_refinement_levels = 10 +driver::ghost_size = 3 +Carpet::prolongation_order_space = 3 +Carpet::prolongation_order_time = 2 + +CarpetRegrid2::regrid_every = 0 +CarpetRegrid2::num_centres = 1 + +CarpetRegrid2::num_levels_1 = 5 +CarpetRegrid2::radius_1[1] =120.0 +CarpetRegrid2::radius_1[2] = 60.0 +CarpetRegrid2::radius_1[3] = 30.0 +CarpetRegrid2::radius_1[4] = 15.0 + + +time::dtfac = 0.25 +MoL::ODE_Method = "rk4" +MoL::MoL_Intermediate_Steps = 4 +MoL::MoL_Num_Scratch_Levels = 1 + +# check all physical variables for NaNs +ActiveThorns = "NaNChecker" +#NaNChecker::check_every = 1 +#NaNChecker::action_if_found = "just warn" #"terminate", "just warn", "abort" +#NaNChecker::check_vars = "ADMBase::metric ADMBase::lapse ADMBase::shift HydroBase::rho HydroBase::eps HydroBase::press HydroBase::vel" + +## Lapse Condition: \\partial_t alpha = - alpha K +## Shift Condition: \\partial_t beta^i = 0 + +# Hydro paramters +ActiveThorns = "EOS_Omni" +ActiveThorns = "GRHydro" + +HydroBase::evolution_method = "GRHydro" + +GRHydro::riemann_solver = "Marquina" +GRHydro::GRHydro_eos_type = "Polytype" +GRHydro::GRHydro_eos_table = "2D_Polytrope" +GRHydro::recon_method = "ppm" +GRHydro::GRHydro_stencil = 3 +GRHydro::bound = "none" +GRHydro::rho_abs_min = 1.e-10 +#GRHydro::GRHydro = 18 # Tmunu(10), rho,press,eps,w_lorentz,vel, tau +#GRHydro::GRHydro = 10 # gij(6), alpha, beta(3) + + +ActiveThorns = "GenericFD NewRad" +ActiveThorns = "ML_BSSN ML_BSSN_Helper" +ADMBase::evolution_method = "ML_BSSN" +ADMBase::lapse_evolution_method = "ML_BSSN" +ADMBase::shift_evolution_method = "ML_BSSN" +ADMBase::dtlapse_evolution_method= "ML_BSSN" +ADMBase::dtshift_evolution_method= "ML_BSSN" + +TmunuBase::support_old_CalcTmunu_mechanism = "no" + +ML_BSSN::timelevels = 3 + +ML_BSSN::harmonicN = 1 # 1+log +ML_BSSN::harmonicF = 1.0 # 1+log +ML_BSSN::LapseACoeff = 1.0 +ML_BSSN::ShiftBCoeff = 1.0 +ML_BSSN::ShiftGammaCoeff = 0.0 +ML_BSSN::AlphaDriver = 0.0 +ML_BSSN::BetaDriver = 0.0 +ML_BSSN::LapseAdvectionCoeff = 0.0 +ML_BSSN::ShiftAdvectionCoeff = 0.0 + +ML_BSSN::MinimumLapse = 1.0e-8 + +ML_BSSN::my_initial_boundary_condition = "extrapolate-gammas" +ML_BSSN::my_rhs_boundary_condition = "NewRad" + +ML_BSSN::ML_log_confac_bound = "none" +ML_BSSN::ML_metric_bound = "none" +ML_BSSN::ML_Gamma_bound = "none" +ML_BSSN::ML_trace_curv_bound = "none" +ML_BSSN::ML_curv_bound = "none" +ML_BSSN::ML_lapse_bound = "none" +ML_BSSN::ML_dtlapse_bound = "none" +ML_BSSN::ML_shift_bound = "none" +ML_BSSN::ML_dtshift_bound = "none" + + + +# init parameters +InitBase::initial_data_setup_method = "init_some_levels" + +ActiveThorns = "TOVSolver" + +ADMBase::initial_data = "tov" +ADMBase::initial_lapse = "tov" +ADMBase::initial_shift = "tov" +ADMBase::initial_dtlapse = "zero" +ADMBase::initial_dtshift = "zero" + +TOVSolver::TOV_Rho_Central[0] = 1.28e-3 +TOVSolver::TOV_Gamma[0] = 2.0 +TOVSolver::TOV_K[0] = 100.0 + +# I/O + +IO::out_dir = \$parfile + +IOBasic::outInfo_every = $out_every +IOBasic::outInfo_vars = "HydroBase::rho ADMBase::lapse" + +IOScalar::outScalar_every = $out_every +IOScalar::one_file_per_group = yes +IOScalar::outScalar_vars = " + HydroBase::rho + HydroBase::press + HydroBase::eps + HydroBase::vel + ADMBase::lapse + ADMBase::metric + ADMBase::curv + ADMConstraints::ham + ADMConstraints::momentum +" + +IOASCII::out1D_every = $out_every +IOASCII::one_file_per_group = yes +IOASCII::output_symmetry_points = no +IOASCII::out3D_ghosts = no +IOASCII::out3D_outer_ghosts = no +IOASCII::out1D_vars = " + HydroBase::rho + HydroBase::press + HydroBase::eps + HydroBase::vel + ADMBase::lapse + ADMBase::metric + ADMBase::curv + ADMConstraints::ham + ADMConstraints::momentum +" +PAR_EOF + + open(OUT, ">tov_${res}.par"); + print OUT "$par"; + close(OUT); +} + Property changes on: examples/tov/tov.rpar ___________________________________________________________________

1 0

[svn:einsteintoolkit] www/about/members/ (Rev. 464)
by knarf＠cct.lsu.edu 04 Mar '11

04 Mar '11

User: knarf Date: 2011/03/04 11:30 AM Modified: /about/members/ members.txt Log: add Wolfgang Kastaun File Changes: Directory: /about/members/ ========================== File [modified]: members.txt Delta lines: +3 -0 =================================================================== --- about/members/members.txt 2011-02-13 04:02:21 UTC (rev 463) +++ about/members/members.txt 2011-03-04 17:30:29 UTC (rev 464) @@ -81,6 +81,9 @@ Seoul National University Hee Il Kim +http://www.sissa.it/main/ SISSA - International School for Advanced Studies + Wolfgang Kastaun + http://www.uib.es/ Universitat de les Illes Balears Sascha Husa Denis Pollney

1 0

[svn:einsteintoolkit] Multipole/trunk/src/ (Rev. 77)
by ian.hinder＠aei.mpg.de 03 Mar '11

03 Mar '11

User: hinder Date: 2011/03/03 09:42 AM Modified: /trunk/src/ multipole.cc Log: Remove extra debug output Increase max number of spin weights File Changes: Directory: /trunk/src/ ====================== File [modified]: multipole.cc Delta lines: +1 -4 =================================================================== --- trunk/src/multipole.cc 2011-03-03 15:42:47 UTC (rev 76) +++ trunk/src/multipole.cc 2011-03-03 15:42:59 UTC (rev 77) @@ -19,7 +19,7 @@ static const int var_name_length = 30; static const int max_vars = 10; -static const int max_spin_weights = 3; +static const int max_spin_weights = 10; static const int max_l_modes = 10; static const int max_m_modes = 2 * max_l_modes + 1; @@ -67,9 +67,6 @@ char buffer[buffer_length]; Util_TableGetInt(table, &v->spin_weight , "sw"); -///////////////////////////////////////////////////////////// -CCTK_VInfo(CCTK_THORNSTRING,"spinweight %d", v->spin_weight); -///////////////////////////////////////////////////////////// if (Util_TableGetString(table, buffer_length, buffer , "cmplx") >= 0) { v->imag_index = CCTK_VarIndex(buffer);

1 0

[svn:einsteintoolkit] Multipole/trunk/src/ (Rev. 76)
by ian.hinder＠aei.mpg.de 03 Mar '11

03 Mar '11

User: hinder Date: 2011/03/03 09:42 AM Modified: /trunk/src/ utils.cc Log: Correct check for whether to truncate output HDF5 file Previously a "first_time" variable was used to determine if truncation should happen. When decomposing multiple variables, this logic is incorrect. We now store the first_time information per output file. File Changes: Directory: /trunk/src/ ====================== File [modified]: utils.cc Delta lines: +21 -6 =================================================================== --- trunk/src/utils.cc 2011-02-23 14:23:41 UTC (rev 75) +++ trunk/src/utils.cc 2011-03-03 15:42:47 UTC (rev 76) @@ -2,6 +2,7 @@ #include <string.h> #include <math.h> #include <string> +#include <map> #include <sys/stat.h> #include <errno.h> #include <iostream> @@ -152,6 +153,12 @@ #ifdef HAVE_CAPABILITY_HDF5 +static bool file_exists(const string &name) +{ + struct stat sts; + return !(stat(name.c_str(), &sts) == -1 && errno == ENOENT); +} + bool dataset_exists(hid_t file, const string &dataset_name) { // To test whether a dataset exists, the recommended way in API 1.6 @@ -182,15 +189,23 @@ string output_name = out_dir + string("/") + basename; int status = 0; - static int first_time = true; + static map<string,bool> checked; // Has the given file been checked + // for truncation? map<*,bool> + // defaults to false - hid_t file = - (first_time && IO_TruncateOutputFiles(cctkGH)) ? - H5Fcreate(output_name.c_str(), H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT) : - H5Fopen(output_name.c_str(), H5F_ACC_RDWR, H5P_DEFAULT); + hid_t file; - first_time = false; + if (!file_exists(output_name) || (!checked[output_name] && IO_TruncateOutputFiles(cctkGH))) + { + file = H5Fcreate(output_name.c_str(), H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); + } + else + { + file = H5Fopen(output_name.c_str(), H5F_ACC_RDWR, H5P_DEFAULT); + } + checked[output_name] = true; + hid_t dataset = -1; if (dataset_exists(file, datasetname))

1 0

[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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits March 2011