Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

New changesets in Carpet Mercurial
by Carpet mercurial repositories 31 Jan '12

31 Jan '12

changeset: 3425:b38f80ff797c parent: 3344:a753e4844d1e user: knarf(a)cct.lsu.edu date: Tue Jan 31 21:22:34 2012 -0600 summary: CarpetIOHDF5: Use CXX flags for CXX compiler changeset: 3426:5a54bb50a799 tag: tip parent: 3425:b38f80ff797c parent: 3424:3dfb99d3e7b9 user: knarf(a)cct.lsu.edu date: Tue Jan 31 21:28:52 2012 -0600 summary: merge

1 0

[svn:einsteintoolkit] EOS_Omni/trunk/ (Rev. 55)
by cott＠tapir.caltech.edu 31 Jan '12

31 Jan '12

User: cott Date: 2012/01/31 04:01 PM Modified: /trunk/ schedule.ccl /trunk/src/nuc_eos/ eosmodule.F90, readtable.c Log: * add banner informing user that EOS table is being read * fix scheduling issue (reading the table was not scheduled in global mode) * re-add option of turning off energy shift File Changes: Directory: /trunk/src/nuc_eos/ ============================== File [modified]: eosmodule.F90 Delta lines: +7 -0 =================================================================== --- trunk/src/nuc_eos/eosmodule.F90 2011-11-13 15:50:01 UTC (rev 54) +++ trunk/src/nuc_eos/eosmodule.F90 2012-01-31 22:01:47 UTC (rev 55) @@ -70,6 +70,8 @@ ! directly. subroutine allocate_eosmodule(nrho_, ntemp_, nye_, alltables_, logrho_, logtemp_, ye_, energy_shift_) use eosmodule + DECLARE_CCTK_PARAMETERS + CCTK_INT :: nrho_, ntemp_, nye_ CCTK_REAL :: alltables_(nrho_, ntemp_, nye_, 19) CCTK_REAL :: logrho_(nrho_) @@ -85,12 +87,17 @@ allocate(logrho(nrho)) allocate(logtemp(ntemp)) allocate(ye(nye)) + alltables = alltables_ logrho = logrho_ logtemp = logtemp_ ye = ye_ + energy_shift = energy_shift_ + if(do_energy_shift.ne.1) then + energy_shift = 0.0d0 + endif ! set min-max values: eos_rhomin = 10.0d0**logrho(1) File [modified]: readtable.c Delta lines: +9 -0 =================================================================== --- trunk/src/nuc_eos/readtable.c 2011-11-13 15:50:01 UTC (rev 54) +++ trunk/src/nuc_eos/readtable.c 2012-01-31 22:01:47 UTC (rev 55) @@ -43,6 +43,12 @@ DECLARE_CCTK_PARAMETERS DECLARE_CCTK_ARGUMENTS + CCTK_Info(CCTK_THORNSTRING,"*******************************"); + CCTK_Info(CCTK_THORNSTRING,"Reading nuc_eos table file:"); + CCTK_Info(CCTK_THORNSTRING,nuceos_table_name); + CCTK_Info(CCTK_THORNSTRING,"*******************************"); + + hid_t file; if (!file_is_readable(nuceos_table_name)) CCTK_VWarn(CCTK_WARN_ABORT, __LINE__, __FILE__, CCTK_THORNSTRING, @@ -74,6 +80,7 @@ READ_EOS_HDF5("pointstemp", &ntemp, H5T_NATIVE_INT, H5S_ALL); READ_EOS_HDF5("pointsye", &nye, H5T_NATIVE_INT, H5S_ALL); + // Allocate memory for tables CCTK_REAL *alltables, *logrho, *logtemp, *ye, energy_shift; @@ -116,6 +123,7 @@ // Gamma READ_EOSTABLE_HDF5("gamma", 18); + // 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); @@ -129,6 +137,7 @@ CCTK_FNAME(allocate_eosmodule) (&nrho, &ntemp, &nye, alltables, logrho, logtemp, ye, &energy_shift); + // Free the memory again because fortran copied the whole thing now free(ye); free(logtemp); Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +1 -0 =================================================================== --- trunk/schedule.ccl 2011-11-13 15:50:01 UTC (rev 54) +++ trunk/schedule.ccl 2012-01-31 22:01:47 UTC (rev 55) @@ -12,6 +12,7 @@ SCHEDULE EOS_OMNI_ReadTable AT CCTK_INITIAL before ADMBase_InitialData { LANG: C + OPTIONS: global } "Read EOS HDF5 table" }

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 27 Jan '12

27 Jan '12

changeset: 3424:3dfb99d3e7b9 tag: tip user: Roland Haas <rhaas(a)caltech.edu> date: Fri Jan 27 15:49:02 2012 -0800 summary: CarpetLib: add empty constructor to struct slab to make gcc happy

1 0

[svn:einsteintoolkit] Meudon_Mag_NS/trunk/src/ (Rev. 15)
by roland.haas＠physics.gatech.edu 26 Jan '12

26 Jan '12

User: rhaas Date: 2012/01/26 11:05 AM Modified: /trunk/src/ Mag_NS.cc Log: catch ios::failure exception from Mag_NS and transfer to CCTK_Warn File Changes: Directory: /trunk/src/ ====================== File [modified]: Mag_NS.cc Delta lines: +6 -0 =================================================================== --- trunk/src/Mag_NS.cc 2011-10-25 18:45:21 UTC (rev 14) +++ trunk/src/Mag_NS.cc 2012-01-26 17:05:05 UTC (rev 15) @@ -1,6 +1,7 @@ #include <cassert> #include <cstdio> #include <vector> +#include <ios> #include <cctk.h> #include <cctk_Arguments.h> @@ -69,6 +70,7 @@ CCTK_VInfo (CCTK_THORNSTRING, "Reading from file \"%s\"", filename); + try { Mag_NS mag_ns (npoints, &xx[0], &yy[0], &zz[0], filename); CCTK_VInfo (CCTK_THORNSTRING, "omega [rad/s]: %g", mag_ns.omega); @@ -194,4 +196,8 @@ CCTK_INFO ("Done."); + } catch (ios::failure e) { + CCTK_VWarn (CCTK_WARN_ABORT, __LINE__, __FILE__, CCTK_THORNSTRING, + "Could not read initial data from file '%s': %s", filename, e.what()); + } }

1 0

[svn:einsteintoolkit] Meudon_Bin_BH/trunk/src/ (Rev. 13)
by roland.haas＠physics.gatech.edu 26 Jan '12

26 Jan '12

User: rhaas Date: 2012/01/26 11:04 AM Modified: /trunk/src/ Bin_BH.cc Log: catch ios::failure exception from Bin_NS and transfer to CCTK_Warn File Changes: Directory: /trunk/src/ ====================== File [modified]: Bin_BH.cc Delta lines: +6 -0 =================================================================== --- trunk/src/Bin_BH.cc 2011-10-25 18:45:20 UTC (rev 12) +++ trunk/src/Bin_BH.cc 2012-01-26 17:04:26 UTC (rev 13) @@ -2,6 +2,7 @@ #include <cmath> #include <cstdio> #include <vector> +#include <ios> #include <cctk.h> #include <cctk_Arguments.h> @@ -63,6 +64,7 @@ CCTK_VInfo (CCTK_THORNSTRING, "Reading from file \"%s\"", filename); + try { Bin_BH bin_bh (npoints, &xx[0], &yy[0], &zz[0], 1, filename); CCTK_VInfo (CCTK_THORNSTRING, "Omega [1/a]: %g", bin_bh.omega); @@ -165,4 +167,8 @@ CCTK_INFO ("Done."); + } catch (ios::failure e) { + CCTK_VWarn (CCTK_WARN_ABORT, __LINE__, __FILE__, CCTK_THORNSTRING, + "Could not read initial data from file '%s': %s", filename, e.what()); + } }

1 0

[svn:einsteintoolkit] Meudon_Bin_NS/trunk/src/ (Rev. 15)
by roland.haas＠physics.gatech.edu 26 Jan '12

26 Jan '12

User: rhaas Date: 2012/01/26 11:03 AM Modified: /trunk/src/ Bin_NS.cc Log: catch ios::failure exception from Bin_NS and transfer to CCTK_Warn File Changes: Directory: /trunk/src/ ====================== File [modified]: Bin_NS.cc Delta lines: +6 -0 =================================================================== --- trunk/src/Bin_NS.cc 2011-10-25 18:45:21 UTC (rev 14) +++ trunk/src/Bin_NS.cc 2012-01-26 17:03:48 UTC (rev 15) @@ -4,6 +4,7 @@ #include <cstdio> #include <cassert> #include <vector> +#include <ios> #include <cctk.h> #include <cctk_Arguments.h> @@ -80,6 +81,7 @@ CCTK_VInfo (CCTK_THORNSTRING, "Reading from file \"%s\"", filename); + try { Bin_NS bin_ns (npoints, &xx[0], &yy[0], &zz[0], filename); CCTK_VInfo (CCTK_THORNSTRING, "omega [rad/s]: %g", bin_ns.omega); @@ -196,5 +198,9 @@ } CCTK_INFO ("Done."); + } catch (ios::failure e) { + CCTK_VWarn (CCTK_WARN_ABORT, __LINE__, __FILE__, CCTK_THORNSTRING, + "Could not read initial data from file '%s': %s", filename, e.what()); + } }

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 311)
by reisswig＠tapir.caltech.edu 24 Jan '12

24 Jan '12

User: reisswig Date: 2012/01/24 07:20 PM Modified: /trunk/src/ GRHydro_PPMReconstruct_drv.F90 Log: Fixed a problem with gxx vs g11. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_PPMReconstruct_drv.F90 Delta lines: +3 -3 =================================================================== --- trunk/src/GRHydro_PPMReconstruct_drv.F90 2012-01-03 22:13:04 UTC (rev 310) +++ trunk/src/GRHydro_PPMReconstruct_drv.F90 2012-01-25 01:20:26 UTC (rev 311) @@ -163,7 +163,7 @@ velzminus(:,j,k),epsminus(:,j,k),rhoplus(:,j,k),& velxplus(:,j,k),velyplus(:,j,k),velzplus(:,j,k),epsplus(:,j,k),& trivial_rp(:,j,k), hydro_excision_mask(:,j,k),& - gxx(:,j,k), g12(:,j,k), g13(:,j,k), g22(:,j,k), g23(:,j,k), & + g11(:,j,k), g12(:,j,k), g13(:,j,k), g22(:,j,k), g23(:,j,k), & g33(:,j,k), beta1(:,j,k), alp(:,j,k),& w_lorentz(:,j,k), & 1, j, k, nx, ny, nz, GRHydro_mppm_eigenvalue_x_left, & @@ -215,7 +215,7 @@ velyplus(j,:,k),velzplus(j,:,k),velxplus(j,:,k),epsplus(j,:,k),& trivial_rp(j,:,k), hydro_excision_mask(j,:,k),& g22(j,:,k), g23(j,:,k), g12(j,:,k), g33(j,:,k), g13(j,:,k), & - gxx(j,:,k), beta2(j,:,k), alp(j,:,k),& + g11(j,:,k), beta2(j,:,k), alp(j,:,k),& w_lorentz(j,:,k), & 2, j, k, nx, ny, nz, GRHydro_mppm_eigenvalue_y_left, & GRHydro_mppm_eigenvalue_y_right, & @@ -265,7 +265,7 @@ velyminus(j,k,:),epsminus(j,k,:),rhoplus(j,k,:),& velzplus(j,k,:),velxplus(j,k,:),velyplus(j,k,:),epsplus(j,k,:),& trivial_rp(j,k,:), hydro_excision_mask(j,k,:),& - g33(j,k,:), g13(j,k,:), g23(j,k,:), gxx(j,k,:), g12(j,k,:), & + g33(j,k,:), g13(j,k,:), g23(j,k,:), g11(j,k,:), g12(j,k,:), & g22(j,k,:), beta3(j,k,:), alp(j,k,:),& w_lorentz(j,k,:), & 3, j, k, nx, ny, nz, GRHydro_mppm_eigenvalue_z_left, &

1 0

[svn:einsteintoolkit] SetMask_SphericalSurface/trunk/ (Rev. 114)
by roland.haas＠physics.gatech.edu 24 Jan '12

24 Jan '12

User: rhaas Date: 2012/01/24 02:26 PM Modified: /trunk/ interface.ccl, param.ccl /trunk/src/ SetMask.c Log: support named spherical surfaces File Changes: Directory: /trunk/src/ ====================== File [modified]: SetMask.c Delta lines: +2 -1 =================================================================== --- trunk/src/SetMask.c 2011-10-25 18:45:25 UTC (rev 113) +++ trunk/src/SetMask.c 2012-01-24 20:26:51 UTC (rev 114) @@ -1,6 +1,7 @@ #include "cctk.h" #include "cctk_Arguments.h" #include "cctk_Parameters.h" +#include "cctk_Functions.h" #include "loopcontrol.h" #include "HydroBase.h" @@ -16,7 +17,7 @@ for (int smi = 0; smi < 10; smi++) { - CCTK_INT sfi = SetMask_SurfaceIndex[smi]; + CCTK_INT sfi = sf_IdFromName(SetMask_SurfaceIndex[smi], SetMask_SurfaceName[smi]); if (sfi >= 0 && sf_active[sfi] && sf_valid[sfi] >= 0) { #pragma omp parallel Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +5 -0 =================================================================== --- trunk/interface.ccl 2011-10-25 18:45:25 UTC (rev 113) +++ trunk/interface.ccl 2012-01-24 20:26:51 UTC (rev 114) @@ -5,3 +5,8 @@ inherits: HydroBase SphericalSurface USES INCLUDE: HydroBase.h + +# translate SphericalSurface name into ID +CCTK_INT \ +FUNCTION sf_IdFromName (CCTK_INT IN id, CCTK_POINTER_TO_CONST IN name) +USES FUNCTION sf_IdFromName File [modified]: param.ccl Delta lines: +5 -0 =================================================================== --- trunk/param.ccl 2011-10-25 18:45:25 UTC (rev 113) +++ trunk/param.ccl 2012-01-24 20:26:51 UTC (rev 114) @@ -14,6 +14,11 @@ -1:* :: "-1 to disable (default), >=0 for index" } -1 +CCTK_String SetMask_SurfaceName[10] "Name of spherical surface to use to set mask" STEERABLE=always +{ + ".*":: "emtpy to use SetMask_SurfaceIndex, any other string to use" +} "" + CCTK_REAL SetMask_RadiusFactor[10] "Factor to modify radius of surface for mask" STEERABLE=always { 0:* :: "Some positive factor, default: 1"

1 0

[svn:einsteintoolkit] AHFinderDirect/trunk/ (Rev. 1562)
by roland.haas＠physics.gatech.edu 24 Jan '12

24 Jan '12

User: rhaas Date: 2012/01/24 02:24 PM Modified: /trunk/ interface.ccl, param.ccl /trunk/src/driver/ announce.cc /trunk/test/ misner1.2-025.par Log: support named spherical surfaces File Changes: Directory: /trunk/src/driver/ ============================= File [modified]: announce.cc Delta lines: +3 -1 =================================================================== --- trunk/src/driver/announce.cc 2011-10-25 18:44:52 UTC (rev 1561) +++ trunk/src/driver/announce.cc 2012-01-24 20:24:54 UTC (rev 1562) @@ -13,6 +13,7 @@ #include "cctk.h" #include "cctk_Arguments.h" #include "cctk_Parameters.h" +#include "cctk_Functions.h" #include "config.h" #include "stdc.h" @@ -124,7 +125,8 @@ { // Store in spherical surface - const int sn = which_surface_to_store_info[hn]; + const int sn = sf_IdFromName(which_surface_to_store_info[hn], + which_surface_to_store_info_by_name[hn]); if (sn == -1) then continue; Directory: /trunk/test/ ======================= File [modified]: misner1.2-025.par Delta lines: +3 -1 =================================================================== --- trunk/test/misner1.2-025.par 2011-10-25 18:44:52 UTC (rev 1561) +++ trunk/test/misner1.2-025.par 2012-01-24 20:24:54 UTC (rev 1562) @@ -84,8 +84,10 @@ SphericalSurface::nphi [0] = 32 SphericalSurface::nghoststheta[0] = 2 SphericalSurface::nghostsphi [0] = 2 +SphericalSurface::name [0] = "CommonHorizon" # individual AH +SphericalSurface::name [1] = "ApparentHorizon" SphericalSurface::ntheta [1] = 22 SphericalSurface::nphi [1] = 22 SphericalSurface::nghoststheta[1] = 2 @@ -115,7 +117,7 @@ AHFinderDirect::max_N_zones_per_right_angle = 20 # individual AH -AHFinderDirect::which_surface_to_store_info[1] = 1 +AHFinderDirect::which_surface_to_store_info_by_name[1] = "ApparentHorizon" AHFinderDirect::N_zones_per_right_angle[1] = 20 AHFinderDirect::origin_x[1] = 0.0 AHFinderDirect::origin_y[1] = 0.0 Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +7 -0 =================================================================== --- trunk/interface.ccl 2011-10-25 18:44:52 UTC (rev 1561) +++ trunk/interface.ccl 2012-01-24 20:24:54 UTC (rev 1562) @@ -138,3 +138,10 @@ USES FUNCTION IO_TruncateOutputFiles ################################################################################ + +# translate SphericalSurface name into ID +CCTK_INT \ +FUNCTION sf_IdFromName (CCTK_INT IN id, CCTK_POINTER_TO_CONST IN name) +USES FUNCTION sf_IdFromName + +################################################################################ File [modified]: param.ccl Delta lines: +8 -0 =================================================================== --- trunk/param.ccl 2011-10-25 18:44:52 UTC (rev 1561) +++ trunk/param.ccl 2012-01-24 20:24:54 UTC (rev 1562) @@ -189,6 +189,14 @@ 0:* :: "store info into the corresponding surface" } -1 +string which_surface_to_store_info_by_name[101] \ + "into which surface should we store the info?" \ + STEERABLE=recover +{ +"" :: "use which_surface_to_store_info" +".*" :: "any string" +} "" + # # This parameter controls how verbose this thorn is in printing # informational (non-error) messages describing what it's doing.

1 0

[svn:einsteintoolkit] www/about/members/ (Rev. 781)
by knarf＠cct.lsu.edu 24 Jan '12

24 Jan '12

User: knarf Date: 2012/01/24 12:19 PM Modified: /about/members/ members.txt Log: sort' File Changes: Directory: /about/members/ ========================== File [modified]: members.txt Delta lines: +3 -3 =================================================================== --- about/members/members.txt 2012-01-24 18:18:33 UTC (rev 780) +++ about/members/members.txt 2012-01-24 18:19:35 UTC (rev 781) @@ -24,9 +24,6 @@ Christian Reisswig BÃ©la SzilÃ¡gyi -http://www.cam.ac.uk/ University of Cambridge - Pau Figueras - http://english.cas.cn/ST/ Chinese Academy of Sciences Mew Bing Wan @@ -110,6 +107,9 @@ http://www.uni-bremen.de/ UniversitÃ¤t Bremen Oleg Korobkin +http://www.cam.ac.uk/ University of Cambridge + Pau Figueras + http://www.colorado.edu/ University of Colorado Bruno Giacomazzo

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits