Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[McLachlan]McLachlan branch, master, updated. 0ecb9c45aaace458a1df3efeb18849ec92b2f78c
by Carpet git repositories 12 Aug '12

12 Aug '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "McLachlan". The branch, master has been updated via 0ecb9c45aaace458a1df3efeb18849ec92b2f78c (commit) via 222a08bbeedce3eb4fef78bfa91c917279ad5f90 (commit) from 9301a1b665598cafd094b7a653419de4cef77640 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0ecb9c45aaace458a1df3efeb18849ec92b2f78c Author: Ian Hinder <ian.hinder(a)aei.mpg.de> Date: Sun Aug 12 12:42:26 2012 +0200 Use CCTK_REAL_VEC instead of ptrdiff_t for dirN variables This was generated by an uncommitted change to Kranc as the previous version did not build due to a recent change to Vectors. commit 222a08bbeedce3eb4fef78bfa91c917279ad5f90 Author: Ian Hinder <ian.hinder(a)aei.mpg.de> Date: Sun Aug 12 11:33:28 2012 +0200 Regenerate code Kranc commit 4707e0c3f03cc52d82f88735e602c52cf74f0cbe ----------------------------------------------------------------------- Summary of changes: ML_ADM/src/Differencing.h | 156 +++++----- ML_ADM/src/ML_ADM_Minkowski.cc | 38 ++-- ML_ADM/src/ML_ADM_RHS.cc | 94 +++--- ML_ADM/src/ML_ADM_boundary.cc | 38 ++-- ML_ADM/src/ML_ADM_constraints.cc | 58 ++-- ML_ADM/src/ML_ADM_constraints_boundary.cc | 14 +- ML_ADM/src/ML_ADM_convertFromADMBase.cc | 6 +- ML_ADM/src/ML_ADM_convertToADMBase.cc | 14 +- ML_BSSN/src/Differencing.h | 324 ++++++++++---------- ML_BSSN/src/ML_BSSN_Advect.cc | 26 +- ML_BSSN/src/ML_BSSN_Dissipation.cc | 12 +- ML_BSSN/src/ML_BSSN_InitGamma.cc | 26 +- ML_BSSN/src/ML_BSSN_InitRHS.cc | 62 ++-- ML_BSSN/src/ML_BSSN_Minkowski.cc | 63 ++-- ML_BSSN/src/ML_BSSN_RHS1.cc | 100 +++--- ML_BSSN/src/ML_BSSN_RHS2.cc | 134 ++++---- ML_BSSN/src/ML_BSSN_RHSStaticBoundary.cc | 62 ++-- ML_BSSN/src/ML_BSSN_boundary.cc | 63 ++-- ML_BSSN/src/ML_BSSN_constraints1.cc | 100 +++--- ML_BSSN/src/ML_BSSN_constraints2.cc | 30 +- ML_BSSN/src/ML_BSSN_convertFromADMBase.cc | 18 +- ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.cc | 54 ++-- ML_BSSN/src/ML_BSSN_convertToADMBase.cc | 14 +- .../src/ML_BSSN_convertToADMBaseDtLapseShift.cc | 28 +- ...ML_BSSN_convertToADMBaseDtLapseShiftBoundary.cc | 26 +- .../ML_BSSN_convertToADMBaseFakeDtLapseShift.cc | 26 +- ML_BSSN/src/ML_BSSN_enforce.cc | 16 +- ML_CCZ4/src/Differencing.h | 324 ++++++++++---------- ML_CCZ4/src/ML_CCZ4_Advect.cc | 26 +- ML_CCZ4/src/ML_CCZ4_Dissipation.cc | 12 +- ML_CCZ4/src/ML_CCZ4_InitGamma.cc | 26 +- ML_CCZ4/src/ML_CCZ4_InitRHS.cc | 64 ++-- ML_CCZ4/src/ML_CCZ4_Minkowski.cc | 65 ++-- ML_CCZ4/src/ML_CCZ4_RHS1.cc | 186 ++++++------ ML_CCZ4/src/ML_CCZ4_RHS2.cc | 146 +++++----- ML_CCZ4/src/ML_CCZ4_RHSStaticBoundary.cc | 64 ++-- ML_CCZ4/src/ML_CCZ4_boundary.cc | 65 ++-- ML_CCZ4/src/ML_CCZ4_constraints1.cc | 112 ++++---- ML_CCZ4/src/ML_CCZ4_constraints2.cc | 30 +- ML_CCZ4/src/ML_CCZ4_convertFromADMBase.cc | 20 +- ML_CCZ4/src/ML_CCZ4_convertFromADMBaseGamma.cc | 54 ++-- ML_CCZ4/src/ML_CCZ4_convertToADMBase.cc | 14 +- .../src/ML_CCZ4_convertToADMBaseDtLapseShift.cc | 30 +- ...ML_CCZ4_convertToADMBaseDtLapseShiftBoundary.cc | 28 +- .../ML_CCZ4_convertToADMBaseFakeDtLapseShift.cc | 28 +- ML_CCZ4/src/ML_CCZ4_enforce.cc | 16 +- ML_WaveToy/src/Differencing.h | 48 ++-- ML_WaveToy/src/WT_Dirichlet.cc | 4 +- ML_WaveToy/src/WT_EnergyBoundary.cc | 2 +- ML_WaveToy/src/WT_Gaussian.cc | 2 +- ML_WaveToy/src/WT_Standing.cc | 2 +- ML_WaveToy_CL/src/Differencing.h | 48 ++-- ML_WaveToy_CL/src/WT_CL_Dirichlet.cc | 4 +- ML_WaveToy_CL/src/WT_CL_EnergyBoundary.cc | 2 +- ML_WaveToy_CL/src/WT_CL_Gaussian.cc | 2 +- ML_WaveToy_CL/src/WT_CL_Standing.cc | 2 +- 56 files changed, 1516 insertions(+), 1512 deletions(-) hooks/post-receive -- McLachlan

1 0

[svn:einsteintoolkit] WeylScal4/trunk/src/ (Rev. 122)
by ian.hinder＠aei.mpg.de 11 Aug '12

11 Aug '12

User: hinder Date: 2012/08/11 12:25 PM Modified: /trunk/src/ psi4_calc_2nd.cc, psi4_calc_4th.cc, psi4_calc_Nth.cc, psis_calc_2nd.cc, psis_calc_4th.cc, psis_calc_Nth.cc Log: Regenerate code Kranc commit 4707e0c3f03cc52d82f88735e602c52cf74f0cbe. Tests pass. File Changes: Directory: /trunk/src/ ====================== File [modified]: psi4_calc_2nd.cc Delta lines: <Unavailable> File [modified]: psi4_calc_4th.cc Delta lines: <Unavailable> File [modified]: psi4_calc_Nth.cc Delta lines: <Unavailable> File [modified]: psis_calc_2nd.cc Delta lines: <Unavailable> File [modified]: psis_calc_4th.cc Delta lines: <Unavailable> File [modified]: psis_calc_Nth.cc Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] WeylScal4/trunk/m/ (Rev. 121)
by ian.hinder＠aei.mpg.de 11 Aug '12

11 Aug '12

User: hinder Date: 2012/08/11 12:24 PM Modified: /trunk/m/ WeylScal4.m Log: Add simple Riemann symmetries This cuts Krancing time by approximately a factor of 2. Needs Kranc commit 4707e0c3f03cc52d82f88735e602c52cf74f0cbe. File Changes: Directory: /trunk/m/ ==================== File [modified]: WeylScal4.m Delta lines: +14 -0 =================================================================== --- trunk/m/WeylScal4.m 2012-08-11 17:24:42 UTC (rev 120) +++ trunk/m/WeylScal4.m 2012-08-11 17:24:50 UTC (rev 121) @@ -59,6 +59,20 @@ AssertSymmetricDecreasing[gamma[ua,lb,lc], lb, lc]; +Tensor[R, i_, j_, k_, l_] /; i > j := -R[j, i, k, l]; +Tensor[R, i_, j_, k_, l_] /; i == j := 0; +Tensor[R, i_, j_, k_, l_] /; k > l := -R[i, j, l, k]; +Tensor[R, i_, j_, k_, l_] /; k == l := 0; +Tensor[R, i_, j_, k_, l_] /; i > k := R[k, l, i, j]; +Tensor[R, i_, j_, k_, l_] /; i == k && j > l := R[k, l, i, j]; + +Tensor[R4p, i_, j_, k_, l_] /; i > j := -R4p[j, i, k, l]; +Tensor[R4p, i_, j_, k_, l_] /; i == j := 0; +Tensor[R4p, i_, j_, k_, l_] /; k > l := -R4p[i, j, l, k]; +Tensor[R4p, i_, j_, k_, l_] /; k == l := 0; +Tensor[R4p, i_, j_, k_, l_] /; i > k := R4p[k, l, i, j]; +Tensor[R4p, i_, j_, k_, l_] /; i == k && j > l := R4p[k, l, i, j]; + (* Determinants of the metrics in terms of their components (Mathematica symbolic expressions) *) gDet = Det[MatrixOfComponents[g[la,lb]]];

1 0

[svn:einsteintoolkit] WeylScal4/trunk/src/ (Rev. 120)
by ian.hinder＠aei.mpg.de 11 Aug '12

11 Aug '12

User: hinder Date: 2012/08/11 12:24 PM Modified: /trunk/src/ Differencing.h, invars_calc_2nd.cc, invars_calc_4th.cc, invars_calc_Nth.cc, psi4_calc_2nd.cc, psi4_calc_4th.cc, psi4_calc_Nth.cc, psis_calc_2nd.cc, psis_calc_4th.cc, psis_calc_Nth.cc Log: Regenerate code Kranc version 479985d633085cc09dcd36b76e319fa772fe44fe File Changes: Directory: /trunk/src/ ====================== File [modified]: Differencing.h Delta lines: <Unavailable> File [modified]: invars_calc_2nd.cc Delta lines: <Unavailable> File [modified]: invars_calc_4th.cc Delta lines: <Unavailable> File [modified]: invars_calc_Nth.cc Delta lines: <Unavailable> File [modified]: psi4_calc_2nd.cc Delta lines: <Unavailable> File [modified]: psi4_calc_4th.cc Delta lines: <Unavailable> File [modified]: psi4_calc_Nth.cc Delta lines: <Unavailable> File [modified]: psis_calc_2nd.cc Delta lines: <Unavailable> File [modified]: psis_calc_4th.cc Delta lines: <Unavailable> File [modified]: psis_calc_Nth.cc Delta lines: <Unavailable>

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 10 Aug '12

10 Aug '12

changeset: 3620:e0af185c8c0b user: Roland Haas <roland.haas(a)physics.gatech.edu> date: Fri Aug 03 22:59:05 2012 -0700 summary: CarpetIOHDF5: close memory and HDF5 properties leaks mostly associated changeset: 3621:1089cd7c139d user: Roland Haas <roland.haas(a)physics.gatech.edu> date: Wed Aug 01 11:43:12 2012 -0700 summary: CarpetIOHDF5: do not re-parse files for patches when using changeset: 3622:e3641709714f user: Roland Haas <roland.haas(a)physics.gatech.edu> date: Fri Aug 03 22:34:59 2012 -0700 summary: CarpetIOHDF5: support indices in sequential chunked output changeset: 3623:cfd1f43f4b7f user: Roland Haas <roland.haas(a)physics.gatech.edu> date: Wed Aug 08 20:21:19 2012 -0700 summary: CarpetIOHDF5: defer opening data files until we have to to read a changeset: 3624:f44912befe63 user: Roland Haas <roland.haas(a)physics.gatech.edu> date: Fri Jul 27 19:25:05 2012 -0700 summary: CarpetIOHDF5: teach the checkpointer to write index files changeset: 3625:be246bc0c781 user: Roland Haas <roland.haas(a)physics.gatech.edu> date: Fri Jul 27 19:05:40 2012 -0700 summary: CarpetIOHDF5: add support for index files to file reader changeset: 3626:f0dc71726af0 tag: tip user: Roland Haas <roland.haas(a)physics.gatech.edu> date: Wed Aug 01 11:41:28 2012 -0700 summary: CarpetIOHDF5: close all HDF5 objects when closing a file

1 0

[svn:einsteintoolkit] EOS_Omni/trunk/src/nuc_eos/ (Rev. 66)
by rhaas＠tapir.caltech.edu 09 Aug '12

09 Aug '12

User: rhaas Date: 2012/08/09 07:43 PM Modified: /trunk/src/nuc_eos/ readtable.c Log: EOS_Omni: use H5Fis_hdf5, protect assumed type sizes From: Roland Haas <roland.haas(a)physics.gatech.edu> File Changes: Directory: /trunk/src/nuc_eos/ ============================== File [modified]: readtable.c Delta lines: +5 -14 =================================================================== --- trunk/src/nuc_eos/readtable.c 2012-08-09 21:52:00 UTC (rev 65) +++ trunk/src/nuc_eos/readtable.c 2012-08-10 00:43:38 UTC (rev 66) @@ -31,19 +31,6 @@ #fn_call, _error_code); \ } -static int file_is_readable(const char* filename); -static int file_is_readable(const char* filename) -{ - FILE* fp = NULL; - fp = fopen(filename, "r"); - if(fp != NULL) - { - fclose(fp); - return 1; - } - return 0; -} - // Cactus calls this function. It reads in the table and calls a fortran // function to setup values for the fortran eos module void EOS_OMNI_ReadTable(CCTK_ARGUMENTS) @@ -66,7 +53,7 @@ const int doIO = !read_table_on_single_process || CCTK_MyProc(cctkGH) == my_reader_process; hid_t file = -1; - if (doIO && !file_is_readable(nuceos_table_name)) + if (doIO && ! H5Fis_hdf5(nuceos_table_name) > 0) CCTK_VWarn(CCTK_WARN_ABORT, __LINE__, __FILE__, CCTK_THORNSTRING, "Could not read nuceos_table_name'%s'", nuceos_table_name); @@ -100,6 +87,10 @@ // Allocate memory for tables CCTK_REAL *alltables, *logrho, *logtemp, *ye, energy_shift; + // protect our use of H5T_NATIVE_DOUBLE and H5T_NATIVE_INT + assert (sizeof(CCTK_REAL) == sizeof(double)); + assert (sizeof(CCTK_INT) == sizeof(int)); + if (!(alltables = (CCTK_REAL*)malloc(nrho * ntemp * nye * 19 * sizeof(CCTK_REAL)))) CCTK_WARN(CCTK_WARN_ABORT, "Cannot allocate memory for EOS table\n"); if (!(logrho = (CCTK_REAL*)malloc(nrho * sizeof(CCTK_REAL))))

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 408)
by bcmsma＠astro.rit.edu 09 Aug '12

09 Aug '12

User: bmundim Date: 2012/08/09 05:09 PM Modified: /trunk/src/ GRHydro_RegisterVars.cc Log: Conditionally register Tmunu with MoL based on Tmunu storage being set. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_RegisterVars.cc Delta lines: +6 -3 =================================================================== --- trunk/src/GRHydro_RegisterVars.cc 2012-08-04 07:41:17 UTC (rev 407) +++ trunk/src/GRHydro_RegisterVars.cc 2012-08-09 22:09:37 UTC (rev 408) @@ -65,9 +65,12 @@ register_constrained("HydroBase::eps"); register_constrained("HydroBase::w_lorentz"); register_constrained("HydroBase::vel"); - register_constrained("TmunuBase::stress_energy_scalar"); - register_constrained("TmunuBase::stress_energy_vector"); - register_constrained("TmunuBase::stress_energy_tensor"); + if (*stress_energy_state) + { + register_constrained("TmunuBase::stress_energy_scalar"); + register_constrained("TmunuBase::stress_energy_vector"); + register_constrained("TmunuBase::stress_energy_tensor"); + } if (general_coordinates) { register_constrained("GRHydro::lvel");

1 0

[svn:einsteintoolkit] TmunuBase/trunk/ (Rev. 17)
by bcmsma＠astro.rit.edu 09 Aug '12

09 Aug '12

User: bmundim Date: 2012/08/09 05:07 PM Modified: /trunk/ schedule.ccl Log: Schedule TmunuBase_SetStressEnergyState AT Wragh BEFORE MoL_Register *This allows other thorns to conditionally register Tmunu with MoL based on the fact that stress_energy_state scalar is set or not. File Changes: Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +2 -1 =================================================================== --- trunk/schedule.ccl 2012-07-24 16:55:15 UTC (rev 16) +++ trunk/schedule.ccl 2012-08-09 22:07:47 UTC (rev 17) @@ -7,7 +7,8 @@ # Initialise stuff -SCHEDULE TmunuBase_SetStressEnergyState AT basegrid +#SCHEDULE TmunuBase_SetStressEnergyState AT basegrid +SCHEDULE TmunuBase_SetStressEnergyState AT Wragh BEFORE MoL_Register { LANG: Fortran OPTIONS: global

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 09 Aug '12

09 Aug '12

changeset: 3617:3ad741b06f53 user: Roland Haas <roland.haas(a)physics.gatech.edu> date: Sat May 05 15:12:59 2012 -0700 summary: CarpetIOHDF5: add option checkpoint_every_divisor changeset: 3618:ccc5a41c06f2 user: Roland Haas <roland.haas(a)physics.gatech.edu> date: Tue May 29 10:19:53 2012 -0700 summary: CarpetLib: add self-copy logic to classes with pointer members changeset: 3619:6b449d88260b tag: tip user: Roland Haas <roland.haas(a)physics.gatech.edu> date: Sat Jun 02 09:42:23 2012 -0700 summary: Carpet: make parameters steerable

1 0

[svn:einsteintoolkit] EOS_Omni/trunk/ (Rev. 65)
by rhaas＠tapir.caltech.edu 09 Aug '12

09 Aug '12

User: rhaas Date: 2012/08/09 04:52 PM Modified: /trunk/ configuration.ccl, param.ccl /trunk/src/nuc_eos/ readtable.c /trunk/test/ eos_omni.par Log: add option read_table_on_single_process to have a named processor read the full table and MPI_Bcast it to the other processors From: Roland Haas <roland.haas(a)physics.gatech.edu> File Changes: Directory: /trunk/src/nuc_eos/ ============================== File [modified]: readtable.c Delta lines: +54 -41 =================================================================== --- trunk/src/nuc_eos/readtable.c 2012-08-01 20:35:47 UTC (rev 64) +++ trunk/src/nuc_eos/readtable.c 2012-08-09 21:52:00 UTC (rev 65) @@ -8,20 +8,28 @@ #include "cctk_Arguments.h" #include "cctk_Functions.h" +// mini NoMPI +#ifdef HAVE_CAPABILITY_MPI +#include <mpi.h> +#define BCAST(buffer, size) MPI_Bcast(buffer, size, MPI_BYTE, my_reader_process, MPI_COMM_WORLD) +#else +#define BCAST(buffer, size) do { /* do nothing */ } while(0) +#endif + // Interface of function for fortran module eostable void CCTK_FNAME(setup_eosmodule) (CCTK_INT* , CCTK_INT* , CCTK_INT*, CCTK_REAL*, CCTK_REAL*, CCTK_REAL*, CCTK_REAL*, CCTK_REAL*); -// Catch HDF5 errors +// call HDF5 if we are an IO processor, handle errors from HDF5 #define HDF5_ERROR(fn_call) \ - do { \ + if (doIO) { \ int _error_code = fn_call; \ if (_error_code < 0) \ CCTK_VWarn (CCTK_WARN_ABORT, __LINE__, __FILE__, CCTK_THORNSTRING, \ "HDF5 call '%s' returned error code %d", \ #fn_call, _error_code); \ - } while (0) + } static int file_is_readable(const char* filename); static int file_is_readable(const char* filename) @@ -48,9 +56,17 @@ CCTK_Info(CCTK_THORNSTRING,nuceos_table_name); CCTK_Info(CCTK_THORNSTRING,"*******************************"); + CCTK_INT my_reader_process = reader_process; + if (my_reader_process < 0 || my_reader_process >= CCTK_nProcs(cctkGH)) + { + CCTK_VWarn(CCTK_WARN_COMPLAIN, __LINE__, __FILE__, CCTK_THORNSTRING, + "Requested IO process %d out of range. Reverting to process 0.", my_reader_process); + my_reader_process = 0; + } + const int doIO = !read_table_on_single_process || CCTK_MyProc(cctkGH) == my_reader_process; - hid_t file; - if (!file_is_readable(nuceos_table_name)) + hid_t file = -1; + if (doIO && !file_is_readable(nuceos_table_name)) CCTK_VWarn(CCTK_WARN_ABORT, __LINE__, __FILE__, CCTK_THORNSTRING, "Could not read nuceos_table_name'%s'", nuceos_table_name); @@ -58,27 +74,27 @@ // Use these two defines to easily read in a lot of variables in the same way // The first reads in one variable of a given type completely -#define READ_EOS_HDF5(NAME,VAR,TYPE,MEM) \ +#define READ_BCAST_EOS_HDF5(NAME,VAR,TYPE,NELEMS) \ do { \ hid_t dataset; \ HDF5_ERROR(dataset = H5Dopen(file, NAME)); \ - HDF5_ERROR(H5Dread(dataset, TYPE, MEM, H5S_ALL, H5P_DEFAULT, VAR)); \ + HDF5_ERROR(H5Dread(dataset, TYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, VAR)); \ + if (read_table_on_single_process) \ + BCAST (VAR, sizeof(*(VAR))*(NELEMS)); \ HDF5_ERROR(H5Dclose(dataset)); \ } while (0) // The second reads a given variable into a hyperslab of the alltables array -#define READ_EOSTABLE_HDF5(NAME,OFF) \ - do { \ - hsize_t offset[2] = {OFF,0}; \ - H5Sselect_hyperslab(mem3, H5S_SELECT_SET, offset, NULL, var3, NULL); \ - READ_EOS_HDF5(NAME,alltables,H5T_NATIVE_DOUBLE,mem3); \ +#define READ_BCAST_EOSTABLE_HDF5(NAME,OFF,DIMS) \ + do { \ + READ_BCAST_EOS_HDF5(NAME,&alltables[(OFF)*(DIMS)[1]],H5T_NATIVE_DOUBLE,(DIMS)[1]); \ } while (0) // Read size of tables CCTK_INT nrho, ntemp, nye; - READ_EOS_HDF5("pointsrho", &nrho, H5T_NATIVE_INT, H5S_ALL); - READ_EOS_HDF5("pointstemp", &ntemp, H5T_NATIVE_INT, H5S_ALL); - READ_EOS_HDF5("pointsye", &nye, H5T_NATIVE_INT, H5S_ALL); + READ_BCAST_EOS_HDF5("pointsrho", &nrho, H5T_NATIVE_INT, 1); + READ_BCAST_EOS_HDF5("pointstemp", &ntemp, H5T_NATIVE_INT, 1); + READ_BCAST_EOS_HDF5("pointsye", &nye, H5T_NATIVE_INT, 1); // Allocate memory for tables @@ -95,42 +111,39 @@ // Prepare HDF5 to read hyperslabs into alltables hsize_t table_dims[2] = {19, nrho * ntemp * nye}; - hsize_t var3[2] = { 1, nrho * ntemp * nye}; - hid_t mem3 = H5Screate_simple(2, table_dims, NULL); // Read alltables - READ_EOSTABLE_HDF5("logpress", 0); - READ_EOSTABLE_HDF5("logenergy", 1); - READ_EOSTABLE_HDF5("entropy", 2); - READ_EOSTABLE_HDF5("munu", 3); - READ_EOSTABLE_HDF5("cs2", 4); - READ_EOSTABLE_HDF5("dedt", 5); - READ_EOSTABLE_HDF5("dpdrhoe", 6); - READ_EOSTABLE_HDF5("dpderho", 7); + READ_BCAST_EOSTABLE_HDF5("logpress", 0, table_dims); + READ_BCAST_EOSTABLE_HDF5("logenergy", 1, table_dims); + READ_BCAST_EOSTABLE_HDF5("entropy", 2, table_dims); + READ_BCAST_EOSTABLE_HDF5("munu", 3, table_dims); + READ_BCAST_EOSTABLE_HDF5("cs2", 4, table_dims); + READ_BCAST_EOSTABLE_HDF5("dedt", 5, table_dims); + READ_BCAST_EOSTABLE_HDF5("dpdrhoe", 6, table_dims); + READ_BCAST_EOSTABLE_HDF5("dpderho", 7, table_dims); // chemical potentials - READ_EOSTABLE_HDF5("muhat", 8); - READ_EOSTABLE_HDF5("mu_e", 9); - READ_EOSTABLE_HDF5("mu_p", 10); - READ_EOSTABLE_HDF5("mu_n", 11); + READ_BCAST_EOSTABLE_HDF5("muhat", 8, table_dims); + READ_BCAST_EOSTABLE_HDF5("mu_e", 9, table_dims); + READ_BCAST_EOSTABLE_HDF5("mu_p", 10, table_dims); + READ_BCAST_EOSTABLE_HDF5("mu_n", 11, table_dims); // compositions - READ_EOSTABLE_HDF5("Xa", 12); - READ_EOSTABLE_HDF5("Xh", 13); - READ_EOSTABLE_HDF5("Xn", 14); - READ_EOSTABLE_HDF5("Xp", 15); + READ_BCAST_EOSTABLE_HDF5("Xa", 12, table_dims); + READ_BCAST_EOSTABLE_HDF5("Xh", 13, table_dims); + READ_BCAST_EOSTABLE_HDF5("Xn", 14, table_dims); + READ_BCAST_EOSTABLE_HDF5("Xp", 15, table_dims); // average nucleus - READ_EOSTABLE_HDF5("Abar", 16); - READ_EOSTABLE_HDF5("Zbar", 17); + READ_BCAST_EOSTABLE_HDF5("Abar", 16, table_dims); + READ_BCAST_EOSTABLE_HDF5("Zbar", 17, table_dims); // Gamma - READ_EOSTABLE_HDF5("gamma", 18); + READ_BCAST_EOSTABLE_HDF5("gamma", 18, table_dims); // Read additional tables and variables - READ_EOS_HDF5("logrho", logrho, H5T_NATIVE_DOUBLE, H5S_ALL); - READ_EOS_HDF5("logtemp", logtemp, H5T_NATIVE_DOUBLE, H5S_ALL); - READ_EOS_HDF5("ye", ye, H5T_NATIVE_DOUBLE, H5S_ALL); - READ_EOS_HDF5("energy_shift", &energy_shift, H5T_NATIVE_DOUBLE, H5S_ALL); + READ_BCAST_EOS_HDF5("logrho", logrho, H5T_NATIVE_DOUBLE, nrho); + READ_BCAST_EOS_HDF5("logtemp", logtemp, H5T_NATIVE_DOUBLE, ntemp); + READ_BCAST_EOS_HDF5("ye", ye, H5T_NATIVE_DOUBLE, nye); + READ_BCAST_EOS_HDF5("energy_shift", &energy_shift, H5T_NATIVE_DOUBLE, 1); - HDF5_ERROR(H5Sclose(mem3)); HDF5_ERROR(H5Fclose(file)); // Give all values to fortran - which will store pointers to them, so don't Directory: /trunk/test/ ======================= File [modified]: eos_omni.par Delta lines: +3 -0 =================================================================== --- trunk/test/eos_omni.par 2012-08-01 20:35:47 UTC (rev 64) +++ trunk/test/eos_omni.par 2012-08-09 21:52:00 UTC (rev 65) @@ -5,6 +5,9 @@ EOS_Omni::dump_nuceos_table = yes EOS_Omni::dump_nuceos_table_name = "TEST_TABLEEOS_rho4_temp4_ye4_version1.0_20120514.asc" +EOS_Omni::read_table_on_single_process = yes +EOS_Omni::reader_process = 1 + IO::out_dir = $parfile #IOASCII::out1D_every = 1 Directory: /trunk/ ================== File [modified]: configuration.ccl Delta lines: +3 -0 =================================================================== --- trunk/configuration.ccl 2012-08-01 20:35:47 UTC (rev 64) +++ trunk/configuration.ccl 2012-08-09 21:52:00 UTC (rev 65) @@ -5,3 +5,6 @@ LANG } +OPTIONAL MPI +{ +} File [modified]: param.ccl Delta lines: +9 -0 =================================================================== --- trunk/param.ccl 2012-08-01 20:35:47 UTC (rev 64) +++ trunk/param.ccl 2012-08-09 21:52:00 UTC (rev 65) @@ -80,6 +80,15 @@ .* :: "Can be anything" } "blah.h5" +BOOLEAN read_table_on_single_process "read table on one process only and bcast data" STEERABLE=ALWAYS +{ +} "no" + +INT reader_process "read table on this process and bcast data" STEERABLE=ALWAYS +{ + 0:* :: "read on process N" +} 0 + shares: IO USES STRING out_dir

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits