Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] www/release-info/ (Rev. 1014)
by rhaas＠tapir.caltech.edu 20 May '13

20 May '13

User: rhaas Date: 2013/05/20 09:58 AM Modified: /release-info/ kraken__1_6.log, kraken__2_6.log Log: update kraken results File Changes: Directory: /release-info/ ========================= File [modified]: kraken__1_6.log Delta lines: +3 -3 =================================================================== --- release-info/kraken__1_6.log 2013-05-19 17:11:54 UTC (rev 1013) +++ release-info/kraken__1_6.log 2013-05-20 14:58:57 UTC (rev 1014) @@ -1217,7 +1217,7 @@ IDAxiBrillBH: test_axibrill_nostagger Success: 96 files compared, 69 differ in the last digits IDAxiOddBrillBH: E2xeon_test_axioddbh - Failure: 88 files compared, 85 differ, 5 differ significantly + Failure: 88 files compared, 87 differ, 5 differ significantly IDAxiOddBrillBH: test_axioddbh Failure: 120 files missing, 0 files compared, 0 differ IDConstraintViolate: ConstraintViolate @@ -1406,8 +1406,8 @@ Summary for configuration sim - Time -> Mon May 6 12:17:07 PDT 2013 - Host -> aprun4 + Time -> Mon May 20 00:05:41 PDT 2013 + Host -> aprun5 Processes -> 1 User -> rhaas File [modified]: kraken__2_6.log Delta lines: +12 -16 =================================================================== --- release-info/kraken__2_6.log 2013-05-19 17:11:54 UTC (rev 1013) +++ release-info/kraken__2_6.log 2013-05-20 14:58:57 UTC (rev 1014) @@ -162,6 +162,10 @@ (EinsteinExact/EinsteinExact_Test/test/Vaidya2.par) Requires 1 processors + testloop in TestLoop + (CactusTest/TestLoop/test/testloop.par) + Requires 1 processors + bhns_eval in TwoPunctures (EinsteinInitialData/TwoPunctures/test/bhns_eval.par) Requires 1 processors @@ -306,8 +310,6 @@ TestLocalReduce [3] - TestLoop [1] - TestPar [1] TestTable [1] @@ -793,10 +795,6 @@ TestSum - TestLoop: - - testloop - TestPar: expressions @@ -975,6 +973,7 @@ TestFreeF90 TestInclude1 TestInclude2 + TestLoop TestMath TestReduce TestSchedule @@ -1188,7 +1187,7 @@ IDAxiBrillBH: test_axibrill_nostagger Success: 96 files compared, 69 differ in the last digits IDAxiOddBrillBH: E2xeon_test_axioddbh - Failure: 88 files compared, 87 differ, 5 differ significantly + Failure: 88 files compared, 86 differ, 5 differ significantly IDAxiOddBrillBH: test_axioddbh Failure: 120 files missing, 0 files compared, 0 differ IDConstraintViolate: ConstraintViolate @@ -1365,8 +1364,6 @@ Success: 6 files identical TestLocalReduce: TestSum Success: 6 files identical - TestLoop: testloop - Success: 0 files identical TestPar: expressions Success: 1 files identical TestTable: test-table @@ -1403,17 +1400,17 @@ Summary for configuration sim - Time -> Sun Apr 28 20:11:35 PDT 2013 - Host -> aprun7 + Time -> Mon May 20 00:02:39 PDT 2013 + Host -> aprun3 Processes -> 2 User -> rhaas Total available tests -> 244 - Unrunnable tests -> 44 - Runnable tests -> 200 + Unrunnable tests -> 45 + Runnable tests -> 199 Total number of thorns -> 193 - Number of tested thorns -> 57 - Number of tests passed -> 188 + Number of tested thorns -> 56 + Number of tests passed -> 187 Number passed only to set tolerance -> 126 Number failed -> 12 @@ -1592,7 +1589,6 @@ TestAvg (from TestLocalReduce) TestMax (from TestLocalReduce) TestSum (from TestLocalReduce) - testloop (from TestLoop) expressions (from TestPar) test-table (from TestTable) trigger (from Trigger)

1 0

[Carpet] branch, master, updated. carpet-6-init-248-gf38e7da
by Carpet git repositories 20 May '13

20 May '13

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 "Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>". The branch, master has been updated via f38e7da6e3481a33fa9b49f2674a84226f5a7aa3 (commit) via ed0df253c7d134be8681e031bfc2a4cc4472ab16 (commit) via 2613d79034fefe8a605534fb205d724c89c5aec4 (commit) via 94934bc46af8fe2f049f2171ca3fb90dcdc4cc5e (commit) via c515a4b4786c50b21ee4b943fe693ff3c2903652 (commit) via c45a84b1397d49b0ce80af073a5815bf6bafc6b7 (commit) via 276ed1e4b33f1ecf16e0881607b1e6439a19b7cd (commit) via c71496243d4ebcd57d1e558a2dd2b0e519b41897 (commit) via 63affbc4c9f953e3471aec55239f64c4906f7658 (commit) via b694764659c6bfedc9e5aeb375635526f8db36e3 (commit) via 0694b5d4b8caec8a2c5abb0680f2362581e88402 (commit) via 1e86f8d4df69edd816f6de837343c852027e9d79 (commit) via b441d66d16d0c81d83a7d52121f9f76b341b9262 (commit) via 8ee9a934e99c8a929d9b166c73560e5c8bfa49c7 (commit) via 53978087cfee27dcd139ea7a5736442f7eeb4efb (commit) via c96cc34b2b8da6b5bd95162e46f45652b574263a (commit) via ccc6d33d3b356c7b70f759495a7611f5169fd8c5 (commit) from a4dc204e712f58cabfc270a5cb158ff9664485cf (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 f38e7da6e3481a33fa9b49f2674a84226f5a7aa3 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Mon May 20 09:32:59 2013 -0500 CarpetLib: Correct some type declarations for 4d grid structures commit ed0df253c7d134be8681e031bfc2a4cc4472ab16 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Mon May 20 09:32:02 2013 -0500 CarpetLib: Add missing #include files to cacheinfo.cc commit 2613d79034fefe8a605534fb205d724c89c5aec4 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Mon May 20 09:31:35 2013 -0500 CarpetLib: Disable unused refluxing face descriptions commit 94934bc46af8fe2f049f2171ca3fb90dcdc4cc5e Author: Erik Schnetter <schnetter(a)gmail.com> Date: Mon May 20 09:28:28 2013 -0500 CarpetLib: Add routines for integer division that always round down Standard integer division truncates, which can lead to problems if an intermediat result is negative. commit c515a4b4786c50b21ee4b943fe693ff3c2903652 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Mon May 20 09:26:27 2013 -0500 CarpetLib: Correct isnorma() for complex numbers commit c45a84b1397d49b0ce80af073a5815bf6bafc6b7 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Mon May 20 09:25:47 2013 -0500 CarpetLib: Don't define static_assert This should now be done by the flesh, using autoconf. commit 276ed1e4b33f1ecf16e0881607b1e6439a19b7cd Author: Erik Schnetter <schnetter(a)gmail.com> Date: Mon May 20 09:25:21 2013 -0500 CarpetLib: Don't explicitly #include cctk_Config.h This is done by cctk.h automatically. commit c71496243d4ebcd57d1e558a2dd2b0e519b41897 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Mon May 20 09:24:24 2013 -0500 CarpetLib: More verbose error output if sanity check fails commit 63affbc4c9f953e3471aec55239f64c4906f7658 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Mon May 20 09:24:00 2013 -0500 CarpetLib: Only check cache line size if it is used commit b694764659c6bfedc9e5aeb375635526f8db36e3 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Mon May 20 09:12:30 2013 -0500 CarpetLib: Change meaning of vect::count to count true (non-zero) elements Change count() from counting all elements, which is already done by size(), to counting true (non-zero) elements, which is what Fortran's count() does as well. commit 0694b5d4b8caec8a2c5abb0680f2362581e88402 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Mon May 20 09:07:11 2013 -0500 CarpetLib: Rename vect::zip to vect::vzip vect::map is already called vect::vmap. commit 1e86f8d4df69edd816f6de837343c852027e9d79 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Mon May 20 09:05:04 2013 -0500 CarpetLib: Add constructors to create a vector from a low-dimensional vector and a scalar commit b441d66d16d0c81d83a7d52121f9f76b341b9262 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Mon May 20 09:03:47 2013 -0500 CarpetLib: Add some comments explaining implementation commit 8ee9a934e99c8a929d9b166c73560e5c8bfa49c7 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Mon May 20 08:59:27 2013 -0500 CarpetIOASCII: Indentation change commit 53978087cfee27dcd139ea7a5736442f7eeb4efb Author: Erik Schnetter <schnetter(a)gmail.com> Date: Mon May 20 08:59:05 2013 -0500 CarpetInterp2: Convert some loop bounds to int The Cray compiler requests this for OpenMP. commit c96cc34b2b8da6b5bd95162e46f45652b574263a Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 19 21:27:37 2013 -0400 CarpetIOF5: Do not output irrelevant "Writing simulation metadata" messages commit ccc6d33d3b356c7b70f759495a7611f5169fd8c5 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 19 20:29:56 2013 -0400 CarpetIOF5: Correct calculating the I/O processor numbers ----------------------------------------------------------------------- Summary of changes: Carpet/CarpetIOASCII/src/ioascii.cc | 8 ++-- Carpet/CarpetInterp2/src/fasterp.cc | 12 +++--- Carpet/CarpetLib/src/cacheinfo.cc | 9 +++++- Carpet/CarpetLib/src/data.cc | 6 ++-- Carpet/CarpetLib/src/defs.hh | 40 ++++++++++++++--------- Carpet/CarpetLib/src/dh.cc | 10 +++++- Carpet/CarpetLib/src/dh.hh | 4 ++- Carpet/CarpetLib/src/mem.cc | 4 ++ Carpet/CarpetLib/src/operator_prototypes_4d.hh | 2 + Carpet/CarpetLib/src/vect.cc | 4 ++ Carpet/CarpetLib/src/vect.hh | 28 +++++++++++++--- CarpetDev/CarpetIOF5/src/iof5.cc | 10 ++++-- CarpetDev/CarpetIOF5/src/output.cc | 4 +- 13 files changed, 98 insertions(+), 43 deletions(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[svn:einsteintoolkit] www/release-info/ (Rev. 1013)
by eloisa.bentivegna＠aei.mpg.de 19 May '13

19 May '13

User: bentivegna Date: 2013/05/19 12:11 PM Added: /release-info/ supermuc__2_8.log Removed: /release-info/ supermuc__2_16.log Modified: /release-info/ supermuc__1_16.log Log: New test results for supermuc. File Changes: Directory: /release-info/ ========================= File [modified]: supermuc__1_16.log Delta lines: <Unavailable> File [removed]: supermuc__2_16.log Delta lines: <Unavailable> File [added]: supermuc__2_8.log Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] HydroBase/ (Rev. 65)
by rhaas＠tapir.caltech.edu 17 May '13

17 May '13

User: rhaas Date: 2013/05/17 12:40 PM Added: /branches/ET_2013_05/src/ ParamCheck.c Modified: /branches/ET_2013_05/ param.ccl, schedule.ccl /branches/ET_2013_05/src/ make.code.defn Log: HydroBase: add paramcheck for "read from file parameters" * add missing "read from file option" to initial_hydro Directory Changes: Directory: /branches/ET_2013_05/ ================================ Property changes on: branches/ET_2013_05 ___________________________________________________________________ Directory: /svn:mergeinfo/ ========================== - /trunk:62 + /trunk:62,64 File Changes: Directory: /branches/ET_2013_05/ ================================ File [modified]: param.ccl Delta lines: +11 -6 =================================================================== --- branches/ET_2013_05/param.ccl 2013-05-17 17:39:54 UTC (rev 64) +++ branches/ET_2013_05/param.ccl 2013-05-17 17:40:53 UTC (rev 65) @@ -4,11 +4,16 @@ USES KEYWORD initial_data_setup_method +SHARES: IO + +USES STRING filereader_ID_vars + RESTRICTED: KEYWORD initial_hydro "The hydro initial data" { "zero" :: "hydro variables are set to vacuum (without atmosphere)" + "read from file" :: "Read the initial data using the IOUtil file reader. Note that this only allows you to read the data from a file, it does not actually do it. You still have to programme the IOUtil file reader accordingly." } "zero" KEYWORD evolution_method "The hydro evolution method" @@ -34,7 +39,7 @@ { "none" :: "inactive" "one" :: "initially set to one" - "read from file" :: "do nothing, filereader will provide data" + "read from file" :: "Read the initial data using the IOUtil file reader. Note that this only allows you to read the data from a file, it does not actually do it. You still have to programme the IOUtil file reader accordingly." } "none" KEYWORD Y_e_evolution_method "Evolution method for Y_e" @@ -58,21 +63,21 @@ { "none" :: "inactive" "zero" :: "initially set to zero" - "read from file" :: "do nothing, filereader will provide data" + "read from file" :: "Read the initial data using the IOUtil file reader. Note that this only allows you to read the data from a file, it does not actually do it. You still have to programme the IOUtil file reader accordingly." } "none" KEYWORD initial_Avec "Initial value for Avec" { "none" :: "inactive" "zero" :: "initially set to zero" - "read from file" :: "do nothing, filereader will provide data" + "read from file" :: "Read the initial data using the IOUtil file reader. Note that this only allows you to read the data from a file, it does not actually do it. You still have to programme the IOUtil file reader accordingly." } "none" KEYWORD initial_Aphi "Initial value for Aphi" { "none" :: "inactive" "zero" :: "initially set to zero" - "read from file" :: "do nothing, filereader will provide data" + "read from file" :: "Read the initial data using the IOUtil file reader. Note that this only allows you to read the data from a file, it does not actually do it. You still have to programme the IOUtil file reader accordingly." } "none" KEYWORD Bvec_evolution_method "Evolution method for Bvec" @@ -91,14 +96,14 @@ { "none" :: "inactive" "zero" :: "initially set to zero" - "read from file" :: "do nothing, filereader will provide data" + "read from file" :: "Read the initial data using the IOUtil file reader. Note that this only allows you to read the data from a file, it does not actually do it. You still have to programme the IOUtil file reader accordingly." } "none" KEYWORD initial_entropy "Initial value for entropy" { "none" :: "inactive" "zero" :: "initially set to zero" - "read from file" :: "do nothing, filereader will provide data" + "read from file" :: "Read the initial data using the IOUtil file reader. Note that this only allows you to read the data from a file, it does not actually do it. You still have to programme the IOUtil file reader accordingly." } "none" File [modified]: schedule.ccl Delta lines: +14 -0 =================================================================== --- branches/ET_2013_05/schedule.ccl 2013-05-17 17:39:54 UTC (rev 64) +++ branches/ET_2013_05/schedule.ccl 2013-05-17 17:40:53 UTC (rev 65) @@ -114,6 +114,20 @@ LANG: C } "Startup banner" +if(CCTK_EQUALS(initial_hydro, "read from file") || + CCTK_EQUALS(initial_Aphi, "read from file") || + CCTK_EQUALS(initial_Avec, "read from file") || + CCTK_EQUALS(initial_Bvec, "read from file") || + CCTK_EQUALS(initial_Y_e, "read from file") || + CCTK_EQUALS(initial_temperature, "read from file") || + CCTK_EQUALS(initial_entropy, "read from file")) +{ +schedule HydroBase_ParamCheck AT PARAMCHECK +{ + LANG: C +} "check that hydrobase parameters are consistent" +} + schedule group HydroBase_RHS in MoL_CalcRHS { } "Groups for scheduling tasks for calculating RHS of hydro variables" Directory: /branches/ET_2013_05/src/ ==================================== File [added]: ParamCheck.c Delta lines: +82 -0 =================================================================== --- branches/ET_2013_05/src/ParamCheck.c (rev 0) +++ branches/ET_2013_05/src/ParamCheck.c 2013-05-17 17:40:53 UTC (rev 65) @@ -0,0 +1,82 @@ +#include <assert.h> +#include <stdlib.h> + +#include "cctk.h" +#include "cctk_Arguments.h" +#include "cctk_Parameters.h" + +#include "util_String.h" + +static void callback (int idx, const char * optstring, void * callback_arg); + +/** Ensure that all HydroBase initial data that are supposed to be read + from a file are actually scheduled for the file reader. */ +void HydroBase_ParamCheck (CCTK_ARGUMENTS) +{ + DECLARE_CCTK_ARGUMENTS; + DECLARE_CCTK_PARAMETERS; + + char * variable_is_read; + int i; + int nvars; + + const struct { + const char * paramname; + const char * paramvalue; + const char * varname; + } vars_to_read[] = { + {"initial_hydro", initial_hydro, "HydroBase::rho"}, + {"initial_hydro", initial_hydro, "HydroBase::vel[0]"}, + {"initial_hydro", initial_hydro, "HydroBase::vel[1]"}, + {"initial_hydro", initial_hydro, "HydroBase::vel[2]"}, + {"initial_hydro", initial_hydro, "HydroBase::eps"}, + {"initial_hydro", initial_hydro, "HydroBase::press"}, + {"initial_Aphi", initial_Aphi, "HydroBase::Aphi"}, + {"initial_Avec", initial_Avec, "HydroBase::Avec[0]"}, + {"initial_Avec", initial_Avec, "HydroBase::Avec[1]"}, + {"initial_Avec", initial_Avec, "HydroBase::Avec[2]"}, + {"initial_Bvec", initial_Bvec, "HydroBase::Bvec[0]"}, + {"initial_Bvec", initial_Bvec, "HydroBase::Bvec[1]"}, + {"initial_Bvec", initial_Bvec, "HydroBase::Bvec[2]"}, + {"initial_Y_e", initial_Y_e, "HydroBase::Ye"}, + {"initial_temperature", initial_temperature, "HydroBase::temperature"}, + {"initial_entropy", initial_entropy, "HydroBase::entropy"}, + }; + + variable_is_read = malloc (CCTK_NumVars()); + assert (variable_is_read); + for (i=0; i<CCTK_NumVars(); ++i) { + variable_is_read[i] = 0; + } + + nvars = CCTK_TraverseString + (filereader_ID_vars, callback, variable_is_read, CCTK_GROUP_OR_VAR); + assert (nvars >= 0); + + for (i=0; i<(int)(sizeof(vars_to_read)/sizeof(vars_to_read[0])); ++i) { + if (CCTK_EQUALS(vars_to_read[i].paramvalue, "read from file")) { + int const ivar = CCTK_VarIndex (vars_to_read[i].varname); + assert (ivar >= 0); + if (! variable_is_read[ivar]) { + char * msg; + size_t written = Util_asprintf(&msg, + "'%s' is initialised using the file reader by '%s', but has not been scheduled to be read. Please set the parameter \"IO::filereader_ID_vars\" accordingly.", + vars_to_read[i].varname, + vars_to_read[i].paramname); + assert(written > 0); + CCTK_PARAMWARN (msg); + free(msg); + } + } + } + + free (variable_is_read); +} + +/** Mark a variable as to be read from the file reader. */ +static void callback (int idx, const char * optstring, void * callback_arg) +{ + assert (idx>=0 && idx<CCTK_NumVars()); + ((char *)callback_arg)[idx] = 1; +} + File [modified]: make.code.defn Delta lines: +1 -1 =================================================================== --- branches/ET_2013_05/src/make.code.defn 2013-05-17 17:39:54 UTC (rev 64) +++ branches/ET_2013_05/src/make.code.defn 2013-05-17 17:40:53 UTC (rev 65) @@ -1,7 +1,7 @@ # Main make.code.defn file for thorn HydroBase # Source files in this directory -SRCS = StartUp.c Initialisation.c +SRCS = StartUp.c Initialisation.c ParamCheck.c # Subdirectories containing source files SUBDIRS =

1 0

[svn:einsteintoolkit] HydroBase/ (Rev. 64)
by rhaas＠tapir.caltech.edu 17 May '13

17 May '13

User: rhaas Date: 2013/05/17 12:39 PM Added: /trunk/src/ ParamCheck.c Modified: /trunk/ param.ccl, schedule.ccl /trunk/src/ make.code.defn Log: HydroBase: add paramcheck for "read from file parameters" * add missing "read from file option" to initial_hydro Directory Changes: Directory: /svn:mime-type/ ========================== + text/x-csrc File Changes: Directory: /trunk/src/ ====================== File [added]: ParamCheck.c Delta lines: +82 -0 =================================================================== --- trunk/src/ParamCheck.c (rev 0) +++ trunk/src/ParamCheck.c 2013-05-17 17:39:54 UTC (rev 64) @@ -0,0 +1,82 @@ +#include <assert.h> +#include <stdlib.h> + +#include "cctk.h" +#include "cctk_Arguments.h" +#include "cctk_Parameters.h" + +#include "util_String.h" + +static void callback (int idx, const char * optstring, void * callback_arg); + +/** Ensure that all HydroBase initial data that are supposed to be read + from a file are actually scheduled for the file reader. */ +void HydroBase_ParamCheck (CCTK_ARGUMENTS) +{ + DECLARE_CCTK_ARGUMENTS; + DECLARE_CCTK_PARAMETERS; + + char * variable_is_read; + int i; + int nvars; + + const struct { + const char * paramname; + const char * paramvalue; + const char * varname; + } vars_to_read[] = { + {"initial_hydro", initial_hydro, "HydroBase::rho"}, + {"initial_hydro", initial_hydro, "HydroBase::vel[0]"}, + {"initial_hydro", initial_hydro, "HydroBase::vel[1]"}, + {"initial_hydro", initial_hydro, "HydroBase::vel[2]"}, + {"initial_hydro", initial_hydro, "HydroBase::eps"}, + {"initial_hydro", initial_hydro, "HydroBase::press"}, + {"initial_Aphi", initial_Aphi, "HydroBase::Aphi"}, + {"initial_Avec", initial_Avec, "HydroBase::Avec[0]"}, + {"initial_Avec", initial_Avec, "HydroBase::Avec[1]"}, + {"initial_Avec", initial_Avec, "HydroBase::Avec[2]"}, + {"initial_Bvec", initial_Bvec, "HydroBase::Bvec[0]"}, + {"initial_Bvec", initial_Bvec, "HydroBase::Bvec[1]"}, + {"initial_Bvec", initial_Bvec, "HydroBase::Bvec[2]"}, + {"initial_Y_e", initial_Y_e, "HydroBase::Ye"}, + {"initial_temperature", initial_temperature, "HydroBase::temperature"}, + {"initial_entropy", initial_entropy, "HydroBase::entropy"}, + }; + + variable_is_read = malloc (CCTK_NumVars()); + assert (variable_is_read); + for (i=0; i<CCTK_NumVars(); ++i) { + variable_is_read[i] = 0; + } + + nvars = CCTK_TraverseString + (filereader_ID_vars, callback, variable_is_read, CCTK_GROUP_OR_VAR); + assert (nvars >= 0); + + for (i=0; i<(int)(sizeof(vars_to_read)/sizeof(vars_to_read[0])); ++i) { + if (CCTK_EQUALS(vars_to_read[i].paramvalue, "read from file")) { + int const ivar = CCTK_VarIndex (vars_to_read[i].varname); + assert (ivar >= 0); + if (! variable_is_read[ivar]) { + char * msg; + size_t written = Util_asprintf(&msg, + "'%s' is initialised using the file reader by '%s', but has not been scheduled to be read. Please set the parameter \"IO::filereader_ID_vars\" accordingly.", + vars_to_read[i].varname, + vars_to_read[i].paramname); + assert(written > 0); + CCTK_PARAMWARN (msg); + free(msg); + } + } + } + + free (variable_is_read); +} + +/** Mark a variable as to be read from the file reader. */ +static void callback (int idx, const char * optstring, void * callback_arg) +{ + assert (idx>=0 && idx<CCTK_NumVars()); + ((char *)callback_arg)[idx] = 1; +} + Property changes on: trunk/src/ParamCheck.c ___________________________________________________________________ File [modified]: make.code.defn Delta lines: +1 -1 =================================================================== --- trunk/src/make.code.defn 2013-05-15 20:49:51 UTC (rev 63) +++ trunk/src/make.code.defn 2013-05-17 17:39:54 UTC (rev 64) @@ -1,7 +1,7 @@ # Main make.code.defn file for thorn HydroBase # Source files in this directory -SRCS = StartUp.c Initialisation.c +SRCS = StartUp.c Initialisation.c ParamCheck.c # Subdirectories containing source files SUBDIRS = Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +11 -6 =================================================================== --- trunk/param.ccl 2013-05-15 20:49:51 UTC (rev 63) +++ trunk/param.ccl 2013-05-17 17:39:54 UTC (rev 64) @@ -4,11 +4,16 @@ USES KEYWORD initial_data_setup_method +SHARES: IO + +USES STRING filereader_ID_vars + RESTRICTED: KEYWORD initial_hydro "The hydro initial data" { "zero" :: "hydro variables are set to vacuum (without atmosphere)" + "read from file" :: "Read the initial data using the IOUtil file reader. Note that this only allows you to read the data from a file, it does not actually do it. You still have to programme the IOUtil file reader accordingly." } "zero" KEYWORD evolution_method "The hydro evolution method" @@ -34,7 +39,7 @@ { "none" :: "inactive" "one" :: "initially set to one" - "read from file" :: "do nothing, filereader will provide data" + "read from file" :: "Read the initial data using the IOUtil file reader. Note that this only allows you to read the data from a file, it does not actually do it. You still have to programme the IOUtil file reader accordingly." } "none" KEYWORD Y_e_evolution_method "Evolution method for Y_e" @@ -58,21 +63,21 @@ { "none" :: "inactive" "zero" :: "initially set to zero" - "read from file" :: "do nothing, filereader will provide data" + "read from file" :: "Read the initial data using the IOUtil file reader. Note that this only allows you to read the data from a file, it does not actually do it. You still have to programme the IOUtil file reader accordingly." } "none" KEYWORD initial_Avec "Initial value for Avec" { "none" :: "inactive" "zero" :: "initially set to zero" - "read from file" :: "do nothing, filereader will provide data" + "read from file" :: "Read the initial data using the IOUtil file reader. Note that this only allows you to read the data from a file, it does not actually do it. You still have to programme the IOUtil file reader accordingly." } "none" KEYWORD initial_Aphi "Initial value for Aphi" { "none" :: "inactive" "zero" :: "initially set to zero" - "read from file" :: "do nothing, filereader will provide data" + "read from file" :: "Read the initial data using the IOUtil file reader. Note that this only allows you to read the data from a file, it does not actually do it. You still have to programme the IOUtil file reader accordingly." } "none" KEYWORD Bvec_evolution_method "Evolution method for Bvec" @@ -91,14 +96,14 @@ { "none" :: "inactive" "zero" :: "initially set to zero" - "read from file" :: "do nothing, filereader will provide data" + "read from file" :: "Read the initial data using the IOUtil file reader. Note that this only allows you to read the data from a file, it does not actually do it. You still have to programme the IOUtil file reader accordingly." } "none" KEYWORD initial_entropy "Initial value for entropy" { "none" :: "inactive" "zero" :: "initially set to zero" - "read from file" :: "do nothing, filereader will provide data" + "read from file" :: "Read the initial data using the IOUtil file reader. Note that this only allows you to read the data from a file, it does not actually do it. You still have to programme the IOUtil file reader accordingly." } "none" File [modified]: schedule.ccl Delta lines: +14 -0 =================================================================== --- trunk/schedule.ccl 2013-05-15 20:49:51 UTC (rev 63) +++ trunk/schedule.ccl 2013-05-17 17:39:54 UTC (rev 64) @@ -114,6 +114,20 @@ LANG: C } "Startup banner" +if(CCTK_EQUALS(initial_hydro, "read from file") || + CCTK_EQUALS(initial_Aphi, "read from file") || + CCTK_EQUALS(initial_Avec, "read from file") || + CCTK_EQUALS(initial_Bvec, "read from file") || + CCTK_EQUALS(initial_Y_e, "read from file") || + CCTK_EQUALS(initial_temperature, "read from file") || + CCTK_EQUALS(initial_entropy, "read from file")) +{ +schedule HydroBase_ParamCheck AT PARAMCHECK +{ + LANG: C +} "check that hydrobase parameters are consistent" +} + schedule group HydroBase_RHS in MoL_CalcRHS { } "Groups for scheduling tasks for calculating RHS of hydro variables"

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 522)
by rhaas＠tapir.caltech.edu 17 May '13

17 May '13

User: rhaas Date: 2013/05/17 11:16 AM Added: /trunk/src/ Con2PrimM_fortran_interfaces.F90, Con2Prim_fortran_interfaces.F90 Removed: /trunk/src/ GRHydro_Interfaces.h, GRHydro_InterfacesM.h Log: GRHydro: add missing files File Changes: Directory: /trunk/src/ ====================== File [added]: Con2PrimM_fortran_interfaces.F90 Delta lines: +189 -0 =================================================================== --- trunk/src/Con2PrimM_fortran_interfaces.F90 (rev 0) +++ trunk/src/Con2PrimM_fortran_interfaces.F90 2013-05-17 16:16:49 UTC (rev 522) @@ -0,0 +1,189 @@ +#include "cctk.h" + +module Con2PrimM_fortran_interfaces + implicit none + + interface + subroutine GRHydro_Con2PrimM_ptold( handle, & + local_gam, dens, & + sx, sy, sz, & + tau, & + Bconsx, Bconsy, Bconsz, & + rho, & + velx, vely, velz,& + epsilon, pressure,& + Bx, By, Bz, & + bsq,& + w_lorentz, & + gxx, gxy, gxz, & + gyy, gyz, gzz, & + uxx, uxy, uxz,& + uyy, uyz, uzz,& + det,& + epsnegative, & + retval) + + implicit none + CCTK_INT handle + CCTK_REAL local_gam + CCTK_REAL dens + CCTK_REAL sx, sy, sz + CCTK_REAL tau + CCTK_REAL Bconsx, Bconsy, Bconsz + CCTK_REAL rho + CCTK_REAL velx, vely, velz + CCTK_REAL epsilon, pressure + CCTK_REAL Bx, By, Bz + CCTK_REAL bsq + CCTK_REAL w_lorentz + CCTK_REAL gxx, gxy, gxz + CCTK_REAL gyy, gyz, gzz + CCTK_REAL uxx, uxy, uxz + CCTK_REAL uyy, uyz, uzz + CCTK_REAL det + CCTK_INT epsnegative + CCTK_REAL retval + end subroutine GRHydro_Con2PrimM_ptold + + subroutine GRHydro_Con2PrimM_pt2( handle, keytemp, eos_prec, prec, & + local_gam, dens, & + sx, sy, sz, & + tau, & + Bconsx, Bconsy, Bconsz, & + xye, xtemp, & + rho, & + velx, vely, velz,& + epsilon, pressure,& + Bx, By, Bz, & + bsq,& + w_lorentz, & + gxx, gxy, gxz, & + gyy, gyz, gzz, & + uxx, uxy, uxz,& + uyy, uyz, uzz,& + det,& + epsnegative, & + retval) + + implicit none + CCTK_INT handle + CCTK_INT keytemp + CCTK_REAL eos_prec + CCTK_REAL prec + CCTK_REAL local_gam + CCTK_REAL dens + CCTK_REAL sx, sy, sz + CCTK_REAL tau + CCTK_REAL Bconsx, Bconsy, Bconsz + CCTK_REAL xye + CCTK_REAL xtemp + CCTK_REAL rho + CCTK_REAL velx, vely, velz + CCTK_REAL epsilon, pressure + CCTK_REAL Bx, By, Bz + CCTK_REAL bsq + CCTK_REAL w_lorentz + CCTK_REAL gxx, gxy, gxz + CCTK_REAL gyy, gyz, gzz + CCTK_REAL uxx, uxy, uxz + CCTK_REAL uyy, uyz, uzz + CCTK_REAL det + CCTK_INT epsnegative + CCTK_REAL retval + end subroutine GRHydro_Con2PrimM_pt2 + + + subroutine GRHydro_Con2PrimM_pt( handle, GRHydro_reflevel, i, j, k, x, y, z, keytemp, eos_prec, prec, & + local_gam, dens, & + sx, sy, sz, & + tau, & + Bconsx, Bconsy, Bconsz, & + xye, xtemp, & + rho, & + velx, vely, velz,& + epsilon, pressure,& + Bx, By, Bz, & + bsq,& + w_lorentz, & + gxx, gxy, gxz, & + gyy, gyz, gzz, & + uxx, uxy, uxz,& + uyy, uyz, uzz,& + det,& + epsnegative, & + retval) + + implicit none + CCTK_INT handle + CCTK_INT GRHydro_reflevel + CCTK_INT i, j, k + CCTK_REAL x, y, z + CCTK_INT keytemp + CCTK_REAL eos_prec + CCTK_REAL prec + CCTK_REAL local_gam + CCTK_REAL dens + CCTK_REAL sx, sy, sz + CCTK_REAL tau + CCTK_REAL Bconsx, Bconsy, Bconsz + CCTK_REAL xye + CCTK_REAL xtemp + CCTK_REAL rho + CCTK_REAL velx, vely, velz + CCTK_REAL epsilon, pressure + CCTK_REAL Bx, By, Bz + CCTK_REAL bsq + CCTK_REAL w_lorentz + CCTK_REAL gxx, gxy, gxz + CCTK_REAL gyy, gyz, gzz + CCTK_REAL uxx, uxy, uxz + CCTK_REAL uyy, uyz, uzz + CCTK_REAL det + CCTK_INT epsnegative + CCTK_REAL retval + end subroutine GRHydro_Con2PrimM_pt + + subroutine GRHydro_Con2PrimM_Polytype_pt( handle, local_gam,& + dens, & + sx, sy, sz, & + sc, & + Bconsx, Bconsy, Bconsz, & + rho, & + velx, vely, velz,& + epsilon, pressure,& + Bx, By, Bz, & + bsq,& + w_lorentz, & + gxx, gxy, gxz, & + gyy, gyz, gzz, & + uxx, uxy, uxz,& + uyy, uyz, uzz,& + det,& + epsnegative, & + retval) + + implicit none + CCTK_INT handle + CCTK_REAL local_gam + CCTK_REAL dens + CCTK_REAL sx, sy, sz + CCTK_REAL sc + CCTK_REAL Bconsx, Bconsy, Bconsz + CCTK_REAL rho + CCTK_REAL velx, vely, velz + CCTK_REAL epsilon, pressure + CCTK_REAL Bx, By, Bz + CCTK_REAL bsq + CCTK_REAL w_lorentz + CCTK_REAL gxx, gxy, gxz + CCTK_REAL gyy, gyz, gzz + CCTK_REAL uxx, uxy, uxz + CCTK_REAL uyy, uyz, uzz + CCTK_REAL det + CCTK_INT epsnegative + CCTK_REAL retval + end subroutine GRHydro_Con2PrimM_Polytype_pt + + end interface + +end module Con2PrimM_fortran_interfaces File [added]: Con2Prim_fortran_interfaces.F90 Delta lines: +88 -0 =================================================================== --- trunk/src/Con2Prim_fortran_interfaces.F90 (rev 0) +++ trunk/src/Con2Prim_fortran_interfaces.F90 2013-05-17 16:16:49 UTC (rev 522) @@ -0,0 +1,88 @@ +#include "cctk.h" + +module Con2Prim_fortran_interfaces + implicit none + + interface + + subroutine Con2Prim_pt(& + handle, & + dens, & + sx, sy, sz, & + tau, & + rho, & + velx, vely, velz, & + epsilon, press, & + w_lorentz, & + uxx, uxy, uxz, & + uyy, uyz, uzz, & + det, & + x, y, z, r, & + epsnegative, & + GRHydro_rho_min, pmin, epsmin, & + GRHydro_reflevel, GRHydro_C2P_failed) + + implicit none + CCTK_INT handle + CCTK_REAL dens + CCTK_REAL sx, sy, sz + CCTK_REAL tau + CCTK_REAL rho + CCTK_REAL velx, vely, velz + CCTK_REAL epsilon, press + CCTK_REAL w_lorentz + CCTK_REAL uxx, uxy, uxz + CCTK_REAL uyy, uyz, uzz + CCTK_REAL det + CCTK_REAL x, y, z, r + logical epsnegative + CCTK_REAL GRHydro_rho_min, pmin, epsmin + CCTK_INT GRHydro_reflevel + CCTK_REAL GRHydro_C2P_failed + end subroutine Con2Prim_pt + + subroutine Con2Prim_ptPolytype(GRHydro_polytrope_handle, & + dens, & + sx, sy, sz, & + tau, & + rho, & + velx, vely, velz, & + eps, press, & + w_lorentz, & + uxx, uxy, uxz, uyy, uyz, uzz, & + det, & + x, y, z, r, & + GRHydro_rho_min, & + GRHydro_reflevel, GRHydro_C2P_failed) + + implicit none + CCTK_INT GRHydro_polytrope_handle + CCTK_REAL dens + CCTK_REAL sx, sy, sz + CCTK_REAL tau + CCTK_REAL rho + CCTK_REAL velx, vely, velz + CCTK_REAL eps, press + CCTK_REAL w_lorentz + CCTK_REAL uxx, uxy, uxz + CCTK_REAL uyy, uyz, uzz + CCTK_REAL det + CCTK_REAL x, y, z, r + CCTK_REAL GRHydro_rho_min + CCTK_INT GRHydro_reflevel + CCTK_REAL GRHydro_C2P_failed + end subroutine Con2Prim_ptPolytype + + subroutine Con2Prim_ptTracer(cons_tracer, tracer, dens) + implicit none + CCTK_REAL cons_tracer, tracer, dens + end subroutine Con2Prim_ptTracer + + subroutine Con2Prim_ptBoundsTracer(cons_tracer, tracer, rho, one_over_w_lorentz, det) + implicit none + CCTK_REAL cons_tracer, tracer, rho, one_over_w_lorentz, det + end subroutine Con2Prim_ptBoundsTracer + + end interface + +end module Con2Prim_fortran_interfaces File [removed]: GRHydro_Interfaces.h Delta lines: +0 -107 =================================================================== --- trunk/src/GRHydro_Interfaces.h 2013-05-17 03:43:54 UTC (rev 521) +++ trunk/src/GRHydro_Interfaces.h 2013-05-17 16:16:49 UTC (rev 522) @@ -1,107 +0,0 @@ -module Con2Prim_fortran_interfaces - implicit none - - interface - - subroutine Con2Prim_pt(handle, & - dens, & - sx, sy, sz, & - tau, & - rho, & - velx, vely, velz, & - epsilon, press, & - w_lorentz, & - uxx, uxy, uxz, & - uyy, uyz, uzz, & - det, & - x, y, z, r, & - epsnegative, & - GRHydro_rho_min, pmin, epsmin, & - GRHydro_reflevel, GRHydro_C2P_failed) - - implicit none - CCTK_INT handle - CCTK_REAL dens - CCTK_REAL sx, sy, sz - CCTK_REAL tau - CCTK_REAL rho - CCTK_REAL velx, vely, velz - CCTK_REAL epsilon, press - CCTK_REAL w_lorentz - CCTK_REAL uxx, uxy, uxz - CCTK_REAL uyy, uyz, uzz - CCTK_REAL det - CCTK_REAL x, y, z, r - logical epsnegative - CCTK_REAL GRHydro_rho_min, pmin, epsmin - CCTK_INT GRHydro_reflevel - CCTK_REAL GRHydro_C2P_failed - end subroutine Con2Prim_pt - - subroutine Con2Prim_ptPolytype(GRHydro_polytrope_handle, & - dens, & - sx, sy, sz, & - tau, & - rho, & - velx, vely, velz, & - eps, press, & - w_lorentz, & - uxx, uxy, uxz, uyy, uyz, uzz, & - det, & - x, y, z, r, & - GRHydro_rho_min, & - GRHydro_reflevel, GRHydro_C2P_failed) - - implicit none - CCTK_INT GRHydro_polytrope_handle - CCTK_REAL dens - CCTK_REAL sx, sy, sz - CCTK_REAL tau - CCTK_REAL rho - CCTK_REAL velx, vely, velz - CCTK_REAL eps, press - CCTK_REAL w_lorentz - CCTK_REAL uxx, uxy, uxz - CCTK_REAL uyy, uyz, uzz - CCTK_REAL det - CCTK_REAL x, y, z, r - CCTK_REAL GRHydro_rho_min - CCTK_INT GRHydro_reflevel - CCTK_REAL GRHydro_C2P_failed - end subroutine Con2Prim_ptPolytype - - subroutine Con2Prim_ptTracer(cons_tracer, tracer, dens) - implicit none - CCTK_REAL cons_tracer, tracer, dens - end subroutine Con2Prim_ptTracer - - subroutine Con2Prim_ptBoundsTracer(cons_tracer, tracer, rho, one_over_w_lorentz, det) - implicit none - CCTK_REAL cons_tracer, tracer, rho, one_over_w_lorentz, det - end subroutine Con2Prim_ptBoundsTracer - - end interface - -end module Con2Prim_fortran_interfaces - -module Eigenproblem_interfaces - implicit none - - interface - - subroutine eigenvalues(handle,rho,velx,vely,velz,eps,w_lorentz,& - lam,gxx,gxy,gxz,gyy,gyz,gzz,u,alp,beta) - - implicit none - - CCTK_REAL rho,velx,vely,velz,eps,w_lorentz - CCTK_REAL lam(5) - CCTK_REAL gxx,gxy,gxz,gyy,gyz,gzz - CCTK_REAL alp,beta,u - CCTK_INT handle - end subroutine - - end interface - -end module Eigenproblem_interfaces - File [removed]: GRHydro_InterfacesM.h Delta lines: +0 -187 =================================================================== --- trunk/src/GRHydro_InterfacesM.h 2013-05-17 03:43:54 UTC (rev 521) +++ trunk/src/GRHydro_InterfacesM.h 2013-05-17 16:16:49 UTC (rev 522) @@ -1,187 +0,0 @@ -module Con2PrimM_fortran_interfaces - implicit none - - interface - subroutine GRHydro_Con2PrimM_ptold( handle, & - local_gam, dens, & - sx, sy, sz, & - tau, & - Bconsx, Bconsy, Bconsz, & - rho, & - velx, vely, velz,& - epsilon, pressure,& - Bx, By, Bz, & - bsq,& - w_lorentz, & - gxx, gxy, gxz, & - gyy, gyz, gzz, & - uxx, uxy, uxz,& - uyy, uyz, uzz,& - det,& - epsnegative, & - retval) - - implicit none - CCTK_INT handle - CCTK_REAL local_gam - CCTK_REAL dens - CCTK_REAL sx, sy, sz - CCTK_REAL tau - CCTK_REAL Bconsx, Bconsy, Bconsz - CCTK_REAL rho - CCTK_REAL velx, vely, velz - CCTK_REAL epsilon, pressure - CCTK_REAL Bx, By, Bz - CCTK_REAL bsq - CCTK_REAL w_lorentz - CCTK_REAL gxx, gxy, gxz - CCTK_REAL gyy, gyz, gzz - CCTK_REAL uxx, uxy, uxz - CCTK_REAL uyy, uyz, uzz - CCTK_REAL det - CCTK_INT epsnegative - CCTK_REAL retval - end subroutine GRHydro_Con2PrimM_ptold - - subroutine GRHydro_Con2PrimM_pt2( handle, keytemp, eos_prec, prec, & - local_gam, dens, & - sx, sy, sz, & - tau, & - Bconsx, Bconsy, Bconsz, & - xye, xtemp, & - rho, & - velx, vely, velz,& - epsilon, pressure,& - Bx, By, Bz, & - bsq,& - w_lorentz, & - gxx, gxy, gxz, & - gyy, gyz, gzz, & - uxx, uxy, uxz,& - uyy, uyz, uzz,& - det,& - epsnegative, & - retval) - - implicit none - CCTK_INT handle - CCTK_INT keytemp - CCTK_REAL eos_prec - CCTK_REAL prec - CCTK_REAL local_gam - CCTK_REAL dens - CCTK_REAL sx, sy, sz - CCTK_REAL tau - CCTK_REAL Bconsx, Bconsy, Bconsz - CCTK_REAL xye - CCTK_REAL xtemp - CCTK_REAL rho - CCTK_REAL velx, vely, velz - CCTK_REAL epsilon, pressure - CCTK_REAL Bx, By, Bz - CCTK_REAL bsq - CCTK_REAL w_lorentz - CCTK_REAL gxx, gxy, gxz - CCTK_REAL gyy, gyz, gzz - CCTK_REAL uxx, uxy, uxz - CCTK_REAL uyy, uyz, uzz - CCTK_REAL det - CCTK_INT epsnegative - CCTK_REAL retval - end subroutine GRHydro_Con2PrimM_pt2 - - - subroutine GRHydro_Con2PrimM_pt( handle, GRHydro_reflevel, i, j, k, x, y, z, keytemp, eos_prec, prec, & - local_gam, dens, & - sx, sy, sz, & - tau, & - Bconsx, Bconsy, Bconsz, & - xye, xtemp, & - rho, & - velx, vely, velz,& - epsilon, pressure,& - Bx, By, Bz, & - bsq,& - w_lorentz, & - gxx, gxy, gxz, & - gyy, gyz, gzz, & - uxx, uxy, uxz,& - uyy, uyz, uzz,& - det,& - epsnegative, & - retval) - - implicit none - CCTK_INT handle - CCTK_INT GRHydro_reflevel - CCTK_INT i, j, k - CCTK_REAL x, y, z - CCTK_INT keytemp - CCTK_REAL eos_prec - CCTK_REAL prec - CCTK_REAL local_gam - CCTK_REAL dens - CCTK_REAL sx, sy, sz - CCTK_REAL tau - CCTK_REAL Bconsx, Bconsy, Bconsz - CCTK_REAL xye - CCTK_REAL xtemp - CCTK_REAL rho - CCTK_REAL velx, vely, velz - CCTK_REAL epsilon, pressure - CCTK_REAL Bx, By, Bz - CCTK_REAL bsq - CCTK_REAL w_lorentz - CCTK_REAL gxx, gxy, gxz - CCTK_REAL gyy, gyz, gzz - CCTK_REAL uxx, uxy, uxz - CCTK_REAL uyy, uyz, uzz - CCTK_REAL det - CCTK_INT epsnegative - CCTK_REAL retval - end subroutine GRHydro_Con2PrimM_pt - - subroutine GRHydro_Con2PrimM_Polytype_pt( handle, local_gam,& - dens, & - sx, sy, sz, & - sc, & - Bconsx, Bconsy, Bconsz, & - rho, & - velx, vely, velz,& - epsilon, pressure,& - Bx, By, Bz, & - bsq,& - w_lorentz, & - gxx, gxy, gxz, & - gyy, gyz, gzz, & - uxx, uxy, uxz,& - uyy, uyz, uzz,& - det,& - epsnegative, & - retval) - - implicit none - CCTK_INT handle - CCTK_REAL local_gam - CCTK_REAL dens - CCTK_REAL sx, sy, sz - CCTK_REAL sc - CCTK_REAL Bconsx, Bconsy, Bconsz - CCTK_REAL rho - CCTK_REAL velx, vely, velz - CCTK_REAL epsilon, pressure - CCTK_REAL Bx, By, Bz - CCTK_REAL bsq - CCTK_REAL w_lorentz - CCTK_REAL gxx, gxy, gxz - CCTK_REAL gyy, gyz, gzz - CCTK_REAL uxx, uxy, uxz - CCTK_REAL uyy, uyz, uzz - CCTK_REAL det - CCTK_INT epsnegative - CCTK_REAL retval - end subroutine GRHydro_Con2PrimM_Polytype_pt - - end interface - -end module Con2PrimM_fortran_interfaces

1 0

[svn:einsteintoolkit] www/release-info/ (Rev. 1012)
by diener＠cct.lsu.edu 16 May '13

16 May '13

User: diener Date: 2013/05/16 11:13 PM Modified: /release-info/ amarok__1_4.log, amarok__2_2.log, queenbee__1_8.log, queenbee__2_4.log, tezpur__1_4.log, tezpur__2_2.log Log: New results. File Changes: Directory: /release-info/ ========================= File [modified]: amarok__1_4.log Delta lines: +14 -14 =================================================================== --- release-info/amarok__1_4.log 2013-05-15 04:04:02 UTC (rev 1011) +++ release-info/amarok__1_4.log 2013-05-17 04:13:04 UTC (rev 1012) @@ -251,14 +251,14 @@ Test created 6 extra files: IDAxiOddBrillBH (E2xeon_test_axioddbh) Test created 12 extra files: + IDAxiOddBrillBH (test_axioddbh) + Test created 24 extra files: Multipole (test_22) Test created 4 extra files: Multipole (test_31) Test created 4 extra files: Multipole (test_44) Test created 4 extra files: - RotatingDBHIVP (test_rdbh) - Test created 24 extra files: RotatingSymmetry180 (Kerr-rotating-180) Test created 4 extra files: RotatingSymmetry180 (Kerr-rotating-180-staggered) @@ -1107,7 +1107,7 @@ AHFinderDirect: checkpointML-EE Success: 7 files compared, 7 differ in the last digits AHFinderDirect: misner1.2-025 - Success: 55 files compared, 9 differ in the last digits + Failure: 55 files compared, 8 differ, 1 differ significantly AHFinderDirect: recoverML Success: 5 files compared, 3 differ in the last digits AHFinderDirect: recoverML-EE @@ -1219,9 +1219,9 @@ IDAxiBrillBH: test_axibrill_nostagger Success: 96 files compared, 69 differ in the last digits IDAxiOddBrillBH: E2xeon_test_axioddbh - Success: 88 files compared, 85 differ in the last digits + Failure: 88 files compared, 84 differ, 5 differ significantly IDAxiOddBrillBH: test_axioddbh - Failure: 120 files missing, 0 files compared, 0 differ + Success: 120 files compared, 74 differ in the last digits IDConstraintViolate: ConstraintViolate Success: 24 files identical IDLinearWaves: test_pw_ADM_leap @@ -1269,7 +1269,7 @@ RotatingDBHIVP: E2xeon_test_rdbh Success: 96 files compared, 92 differ in the last digits RotatingDBHIVP: test_rdbh - Success: 120 files compared, 77 differ in the last digits + Failure: 120 files missing, 0 files compared, 0 differ RotatingSymmetry180: Kerr Success: 144 files compared, 14 differ in the last digits RotatingSymmetry180: Kerr-EE @@ -1408,7 +1408,7 @@ Summary for configuration test - Time -> Mon Apr 29 14:39:54 CDT 2013 + Time -> Thu May 16 21:36:56 CDT 2013 Host -> linux-wovv.site Processes -> 1 User -> diener @@ -1418,10 +1418,10 @@ Runnable tests -> 186 Total number of thorns -> 193 Number of tested thorns -> 56 - Number of tests passed -> 180 + Number of tests passed -> 178 Number passed only to - set tolerance -> 121 - Number failed -> 6 + set tolerance -> 119 + Number failed -> 8 Tests passed: @@ -1463,7 +1463,6 @@ Kerr-selection-mean-coordinate-radius-EE (from AHFinderDirect) checkpointML (from AHFinderDirect) checkpointML-EE (from AHFinderDirect) - misner1.2-025 (from AHFinderDirect) recoverML (from AHFinderDirect) recoverML-EE (from AHFinderDirect) CarpetEvolutionMask_test (from CarpetEvolutionMask) @@ -1517,7 +1516,7 @@ test_misner (from IDAnalyticBH) test_axibrill (from IDAxiBrillBH) test_axibrill_nostagger (from IDAxiBrillBH) - E2xeon_test_axioddbh (from IDAxiOddBrillBH) + test_axioddbh (from IDAxiOddBrillBH) ConstraintViolate (from IDConstraintViolate) test_pw_ADM_leap (from IDLinearWaves) test_pw_ADM_sl (from IDLinearWaves) @@ -1541,7 +1540,6 @@ qlm-ks-tilted (from QuasiLocalMeasures) qlm-minkowski (from QuasiLocalMeasures) E2xeon_test_rdbh (from RotatingDBHIVP) - test_rdbh (from RotatingDBHIVP) Kerr (from RotatingSymmetry180) Kerr-EE (from RotatingSymmetry180) Kerr-rotating-180 (from RotatingSymmetry180) @@ -1608,9 +1606,11 @@ Tests failed: + misner1.2-025 (from AHFinderDirect) KS-tilted (from Exact) GRHydro_test_shock_weno (from GRHydro) - test_axioddbh (from IDAxiOddBrillBH) + E2xeon_test_axioddbh (from IDAxiOddBrillBH) + test_rdbh (from RotatingDBHIVP) Kerr-rotating-180-staggered (from RotatingSymmetry180) Kerr-staggered (from RotatingSymmetry180) Kerr-rotating-90-staggered (from RotatingSymmetry90) File [modified]: amarok__2_2.log Delta lines: +11 -15 =================================================================== --- release-info/amarok__2_2.log 2013-05-15 04:04:02 UTC (rev 1011) +++ release-info/amarok__2_2.log 2013-05-17 04:13:04 UTC (rev 1012) @@ -162,6 +162,10 @@ (EinsteinExact/EinsteinExact_Test/test/Vaidya2.par) Requires 1 processors + testloop in TestLoop + (CactusTest/TestLoop/test/testloop.par) + Requires 1 processors + bhns_eval in TwoPunctures (EinsteinInitialData/TwoPunctures/test/bhns_eval.par) Requires 1 processors @@ -306,8 +310,6 @@ TestLocalReduce [3] - TestLoop [1] - TestPar [1] TestTable [1] @@ -793,10 +795,6 @@ TestSum - TestLoop: - - testloop - TestPar: expressions @@ -975,6 +973,7 @@ TestFreeF90 TestInclude1 TestInclude2 + TestLoop TestMath TestReduce TestSchedule @@ -1188,7 +1187,7 @@ IDAxiBrillBH: test_axibrill_nostagger Success: 96 files compared, 69 differ in the last digits IDAxiOddBrillBH: E2xeon_test_axioddbh - Success: 88 files compared, 85 differ in the last digits + Success: 88 files compared, 84 differ in the last digits IDAxiOddBrillBH: test_axioddbh Failure: 120 files missing, 0 files compared, 0 differ IDConstraintViolate: ConstraintViolate @@ -1365,8 +1364,6 @@ Success: 6 files identical TestLocalReduce: TestSum Success: 6 files identical - TestLoop: testloop - Success: 0 files identical TestPar: expressions Success: 1 files identical TestTable: test-table @@ -1403,17 +1400,17 @@ Summary for configuration test - Time -> Mon Apr 29 15:12:10 CDT 2013 + Time -> Thu May 16 21:44:27 CDT 2013 Host -> linux-wovv.site Processes -> 2 User -> diener Total available tests -> 244 - Unrunnable tests -> 44 - Runnable tests -> 200 + Unrunnable tests -> 45 + Runnable tests -> 199 Total number of thorns -> 193 - Number of tested thorns -> 57 - Number of tests passed -> 189 + Number of tested thorns -> 56 + Number of tests passed -> 188 Number passed only to set tolerance -> 130 Number failed -> 11 @@ -1593,7 +1590,6 @@ TestAvg (from TestLocalReduce) TestMax (from TestLocalReduce) TestSum (from TestLocalReduce) - testloop (from TestLoop) expressions (from TestPar) test-table (from TestTable) trigger (from Trigger) File [modified]: queenbee__1_8.log Delta lines: +3 -3 =================================================================== --- release-info/queenbee__1_8.log 2013-05-15 04:04:02 UTC (rev 1011) +++ release-info/queenbee__1_8.log 2013-05-17 04:13:04 UTC (rev 1012) @@ -1221,7 +1221,7 @@ IDAxiBrillBH: test_axibrill_nostagger Success: 96 files compared, 69 differ in the last digits IDAxiOddBrillBH: E2xeon_test_axioddbh - Success: 88 files compared, 85 differ in the last digits + Success: 88 files compared, 87 differ in the last digits IDAxiOddBrillBH: test_axioddbh Success: 120 files compared, 72 differ in the last digits IDConstraintViolate: ConstraintViolate @@ -1410,8 +1410,8 @@ Summary for configuration test - Time -> Thu Apr 25 18:30:43 CDT 2013 - Host -> qb360 + Time -> Thu May 16 22:03:37 CDT 2013 + Host -> qb605 Processes -> 1 User -> diener File [modified]: queenbee__2_4.log Delta lines: +13 -17 =================================================================== --- release-info/queenbee__2_4.log 2013-05-15 04:04:02 UTC (rev 1011) +++ release-info/queenbee__2_4.log 2013-05-17 04:13:04 UTC (rev 1012) @@ -162,6 +162,10 @@ (EinsteinExact/EinsteinExact_Test/test/Vaidya2.par) Requires 1 processors + testloop in TestLoop + (CactusTest/TestLoop/test/testloop.par) + Requires 1 processors + bhns_eval in TwoPunctures (EinsteinInitialData/TwoPunctures/test/bhns_eval.par) Requires 1 processors @@ -310,8 +314,6 @@ TestLocalReduce [3] - TestLoop [1] - TestPar [1] TestTable [1] @@ -797,10 +799,6 @@ TestSum - TestLoop: - - testloop - TestPar: expressions @@ -979,6 +977,7 @@ TestFreeF90 TestInclude1 TestInclude2 + TestLoop TestMath TestReduce TestSchedule @@ -1194,7 +1193,7 @@ IDAxiOddBrillBH: E2xeon_test_axioddbh Success: 88 files compared, 87 differ in the last digits IDAxiOddBrillBH: test_axioddbh - Success: 120 files compared, 74 differ in the last digits + Success: 120 files compared, 72 differ in the last digits IDConstraintViolate: ConstraintViolate Success: 24 files identical IDLinearWaves: test_pw_ADM_leap @@ -1294,7 +1293,7 @@ RotatingSymmetry180: Kerr-staggered-EE Success: 204 files compared, 54 differ in the last digits RotatingSymmetry180: KerrSchild-rotating-180 - Success: 120 files compared, 89 differ in the last digits + Success: 120 files compared, 87 differ in the last digits RotatingSymmetry90: Kerr-rotating-90 Success: 140 files compared, 7 differ in the last digits RotatingSymmetry90: Kerr-rotating-90-EE @@ -1369,8 +1368,6 @@ Success: 6 files identical TestLocalReduce: TestSum Success: 6 files identical - TestLoop: testloop - Success: 0 files identical TestPar: expressions Success: 1 files identical TestTable: test-table @@ -1407,17 +1404,17 @@ Summary for configuration test - Time -> Thu Apr 25 18:29:24 CDT 2013 - Host -> qb355 + Time -> Thu May 16 22:05:36 CDT 2013 + Host -> qb604 Processes -> 2 User -> diener Total available tests -> 244 - Unrunnable tests -> 44 - Runnable tests -> 200 + Unrunnable tests -> 45 + Runnable tests -> 199 Total number of thorns -> 193 - Number of tested thorns -> 57 - Number of tests passed -> 198 + Number of tested thorns -> 56 + Number of tests passed -> 197 Number passed only to set tolerance -> 135 Number failed -> 2 @@ -1606,7 +1603,6 @@ TestAvg (from TestLocalReduce) TestMax (from TestLocalReduce) TestSum (from TestLocalReduce) - testloop (from TestLoop) expressions (from TestPar) test-table (from TestTable) trigger (from Trigger) File [modified]: tezpur__1_4.log Delta lines: +3 -3 =================================================================== --- release-info/tezpur__1_4.log 2013-05-15 04:04:02 UTC (rev 1011) +++ release-info/tezpur__1_4.log 2013-05-17 04:13:04 UTC (rev 1012) @@ -1221,7 +1221,7 @@ IDAxiBrillBH: test_axibrill_nostagger Success: 96 files compared, 69 differ in the last digits IDAxiOddBrillBH: E2xeon_test_axioddbh - Success: 88 files compared, 85 differ in the last digits + Success: 88 files compared, 87 differ in the last digits IDAxiOddBrillBH: test_axioddbh Success: 120 files compared, 76 differ in the last digits IDConstraintViolate: ConstraintViolate @@ -1410,8 +1410,8 @@ Summary for configuration test - Time -> Thu Apr 25 15:07:07 CDT 2013 - Host -> tezpur001 + Time -> Thu May 16 23:09:04 CDT 2013 + Host -> tezpur330 Processes -> 1 User -> diener File [modified]: tezpur__2_2.log Delta lines: +12 -16 =================================================================== --- release-info/tezpur__2_2.log 2013-05-15 04:04:02 UTC (rev 1011) +++ release-info/tezpur__2_2.log 2013-05-17 04:13:04 UTC (rev 1012) @@ -162,6 +162,10 @@ (EinsteinExact/EinsteinExact_Test/test/Vaidya2.par) Requires 1 processors + testloop in TestLoop + (CactusTest/TestLoop/test/testloop.par) + Requires 1 processors + bhns_eval in TwoPunctures (EinsteinInitialData/TwoPunctures/test/bhns_eval.par) Requires 1 processors @@ -310,8 +314,6 @@ TestLocalReduce [3] - TestLoop [1] - TestPar [1] TestTable [1] @@ -797,10 +799,6 @@ TestSum - TestLoop: - - testloop - TestPar: expressions @@ -979,6 +977,7 @@ TestFreeF90 TestInclude1 TestInclude2 + TestLoop TestMath TestReduce TestSchedule @@ -1192,7 +1191,7 @@ IDAxiBrillBH: test_axibrill_nostagger Success: 96 files compared, 69 differ in the last digits IDAxiOddBrillBH: E2xeon_test_axioddbh - Success: 88 files compared, 86 differ in the last digits + Success: 88 files compared, 85 differ in the last digits IDAxiOddBrillBH: test_axioddbh Success: 120 files compared, 72 differ in the last digits IDConstraintViolate: ConstraintViolate @@ -1369,8 +1368,6 @@ Success: 6 files identical TestLocalReduce: TestSum Success: 6 files identical - TestLoop: testloop - Success: 0 files identical TestPar: expressions Success: 1 files identical TestTable: test-table @@ -1407,17 +1404,17 @@ Summary for configuration test - Time -> Thu Apr 25 14:57:23 CDT 2013 - Host -> tezpur062 + Time -> Thu May 16 23:03:23 CDT 2013 + Host -> tezpur329 Processes -> 2 User -> diener Total available tests -> 244 - Unrunnable tests -> 44 - Runnable tests -> 200 + Unrunnable tests -> 45 + Runnable tests -> 199 Total number of thorns -> 193 - Number of tested thorns -> 57 - Number of tests passed -> 198 + Number of tested thorns -> 56 + Number of tests passed -> 197 Number passed only to set tolerance -> 136 Number failed -> 2 @@ -1606,7 +1603,6 @@ TestAvg (from TestLocalReduce) TestMax (from TestLocalReduce) TestSum (from TestLocalReduce) - testloop (from TestLoop) expressions (from TestPar) test-table (from TestTable) trigger (from Trigger)

1 0

[svn:einsteintoolkit] GRHydro/branches/ET_2013_05/src/ (Rev. 521)
by rhaas＠tapir.caltech.edu 16 May '13

16 May '13

User: rhaas Date: 2013/05/16 10:43 PM Added: /branches/ET_2013_05/src/ Con2PrimM_fortran_interfaces.F90, Con2Prim_fortran_interfaces.F90 Modified: /branches/ET_2013_05/src/ GRHydro_Con2Prim.F90, GRHydro_Con2PrimAM.F90, GRHydro_Con2PrimM.F90, GRHydro_Interfaces.h, GRHydro_InterfacesAM.h, GRHydro_InterfacesM.h, make.code.defn Log: GRHydro: replace C-style include for module with proper module the C-like coding had some problems, in particular it would compile the same module more than once and would circumvent Cactus' module dependency tracking. File Changes: Directory: /branches/ET_2013_05/src/ ==================================== File [added]: Con2PrimM_fortran_interfaces.F90 Delta lines: +97 -0 =================================================================== --- branches/ET_2013_05/src/Con2PrimM_fortran_interfaces.F90 (rev 0) +++ branches/ET_2013_05/src/Con2PrimM_fortran_interfaces.F90 2013-05-17 03:43:54 UTC (rev 521) @@ -0,0 +1,97 @@ +#include "cctk.h" + +module Con2PrimM_fortran_interfaces + implicit none + + interface + + subroutine GRHydro_Con2PrimM_pt( handle, keytemp, prec, & + local_gam, dens, & + sx, sy, sz, & + tau, & + Bconsx, Bconsy, Bconsz, & + xye, xtemp, & + rho, & + velx, vely, velz,& + epsilon, pressure,& + Bx, By, Bz, & + bsq,& + w_lorentz, & + gxx, gxy, gxz, & + gyy, gyz, gzz, & + uxx, uxy, uxz,& + uyy, uyz, uzz,& + det,& + epsnegative, & + retval) + + implicit none + CCTK_INT handle + CCTK_INT keytemp + CCTK_REAL prec + CCTK_REAL local_gam + CCTK_REAL dens + CCTK_REAL sx, sy, sz + CCTK_REAL tau + CCTK_REAL Bconsx, Bconsy, Bconsz + CCTK_REAL xye + CCTK_REAL xtemp + CCTK_REAL rho + CCTK_REAL velx, vely, velz + CCTK_REAL epsilon, pressure + CCTK_REAL Bx, By, Bz + CCTK_REAL bsq + CCTK_REAL w_lorentz + CCTK_REAL gxx, gxy, gxz + CCTK_REAL gyy, gyz, gzz + CCTK_REAL uxx, uxy, uxz + CCTK_REAL uyy, uyz, uzz + CCTK_REAL det + CCTK_INT epsnegative + CCTK_REAL retval + end subroutine GRHydro_Con2PrimM_pt + + subroutine GRHydro_Con2PrimM_Polytype_pt( handle, local_gam,& + dens, & + sx, sy, sz, & + sc, & + Bconsx, Bconsy, Bconsz, & + rho, & + velx, vely, velz,& + epsilon, pressure,& + Bx, By, Bz, & + bsq,& + w_lorentz, & + gxx, gxy, gxz, & + gyy, gyz, gzz, & + uxx, uxy, uxz,& + uyy, uyz, uzz,& + det,& + epsnegative, & + retval) + + implicit none + CCTK_INT handle + CCTK_REAL local_gam + CCTK_REAL dens + CCTK_REAL sx, sy, sz + CCTK_REAL sc + CCTK_REAL Bconsx, Bconsy, Bconsz + CCTK_REAL rho + CCTK_REAL velx, vely, velz + CCTK_REAL epsilon, pressure + CCTK_REAL Bx, By, Bz + CCTK_REAL bsq + CCTK_REAL w_lorentz + CCTK_REAL gxx, gxy, gxz + CCTK_REAL gyy, gyz, gzz + CCTK_REAL uxx, uxy, uxz + CCTK_REAL uyy, uyz, uzz + CCTK_REAL det + CCTK_INT epsnegative + CCTK_REAL retval + end subroutine GRHydro_Con2PrimM_Polytype_pt + + end interface + +end module Con2PrimM_fortran_interfaces File [added]: Con2Prim_fortran_interfaces.F90 Delta lines: +87 -0 =================================================================== --- branches/ET_2013_05/src/Con2Prim_fortran_interfaces.F90 (rev 0) +++ branches/ET_2013_05/src/Con2Prim_fortran_interfaces.F90 2013-05-17 03:43:54 UTC (rev 521) @@ -0,0 +1,87 @@ +#include "cctk.h" + +module Con2Prim_fortran_interfaces + implicit none + + interface + + subroutine Con2Prim_pt(handle, & + dens, & + sx, sy, sz, & + tau, & + rho, & + velx, vely, velz, & + epsilon, press, & + w_lorentz, & + uxx, uxy, uxz, & + uyy, uyz, uzz, & + det, & + x, y, z, r, & + epsnegative, & + GRHydro_rho_min, pmin, epsmin, & + GRHydro_reflevel, GRHydro_C2P_failed) + + implicit none + CCTK_INT handle + CCTK_REAL dens + CCTK_REAL sx, sy, sz + CCTK_REAL tau + CCTK_REAL rho + CCTK_REAL velx, vely, velz + CCTK_REAL epsilon, press + CCTK_REAL w_lorentz + CCTK_REAL uxx, uxy, uxz + CCTK_REAL uyy, uyz, uzz + CCTK_REAL det + CCTK_REAL x, y, z, r + logical epsnegative + CCTK_REAL GRHydro_rho_min, pmin, epsmin + CCTK_INT GRHydro_reflevel + CCTK_REAL GRHydro_C2P_failed + end subroutine Con2Prim_pt + + subroutine Con2Prim_ptPolytype(GRHydro_polytrope_handle, & + dens, & + sx, sy, sz, & + tau, & + rho, & + velx, vely, velz, & + eps, press, & + w_lorentz, & + uxx, uxy, uxz, uyy, uyz, uzz, & + det, & + x, y, z, r, & + GRHydro_rho_min, & + GRHydro_reflevel, GRHydro_C2P_failed) + + implicit none + CCTK_INT GRHydro_polytrope_handle + CCTK_REAL dens + CCTK_REAL sx, sy, sz + CCTK_REAL tau + CCTK_REAL rho + CCTK_REAL velx, vely, velz + CCTK_REAL eps, press + CCTK_REAL w_lorentz + CCTK_REAL uxx, uxy, uxz + CCTK_REAL uyy, uyz, uzz + CCTK_REAL det + CCTK_REAL x, y, z, r + CCTK_REAL GRHydro_rho_min + CCTK_INT GRHydro_reflevel + CCTK_REAL GRHydro_C2P_failed + end subroutine Con2Prim_ptPolytype + + subroutine Con2Prim_ptTracer(cons_tracer, tracer, dens) + implicit none + CCTK_REAL cons_tracer, tracer, dens + end subroutine Con2Prim_ptTracer + + subroutine Con2Prim_ptBoundsTracer(cons_tracer, tracer, rho, one_over_w_lorentz, det) + implicit none + CCTK_REAL cons_tracer, tracer, rho, one_over_w_lorentz, det + end subroutine Con2Prim_ptBoundsTracer + + end interface + +end module Con2Prim_fortran_interfaces File [modified]: GRHydro_Con2Prim.F90 Delta lines: +0 -1 =================================================================== --- branches/ET_2013_05/src/GRHydro_Con2Prim.F90 2013-05-17 03:30:28 UTC (rev 520) +++ branches/ET_2013_05/src/GRHydro_Con2Prim.F90 2013-05-17 03:43:54 UTC (rev 521) @@ -11,7 +11,6 @@ #include "cctk_Arguments.h" #include "cctk_Functions.h" #include "SpaceMask.h" -#include "GRHydro_Interfaces.h" #include "GRHydro_Macros.h" /*@@ File [modified]: GRHydro_Con2PrimAM.F90 Delta lines: +0 -1 =================================================================== --- branches/ET_2013_05/src/GRHydro_Con2PrimAM.F90 2013-05-17 03:30:28 UTC (rev 520) +++ branches/ET_2013_05/src/GRHydro_Con2PrimAM.F90 2013-05-17 03:43:54 UTC (rev 521) @@ -13,7 +13,6 @@ #include "cctk_Arguments.h" #include "cctk_Functions.h" #include "SpaceMask.h" -#include "GRHydro_InterfacesAM.h" #include "GRHydro_Macros.h" #define ITER_TOL (1.0e-8) File [modified]: GRHydro_Con2PrimM.F90 Delta lines: +0 -1 =================================================================== --- branches/ET_2013_05/src/GRHydro_Con2PrimM.F90 2013-05-17 03:30:28 UTC (rev 520) +++ branches/ET_2013_05/src/GRHydro_Con2PrimM.F90 2013-05-17 03:43:54 UTC (rev 521) @@ -12,7 +12,6 @@ #include "cctk_Arguments.h" #include "cctk_Functions.h" #include "SpaceMask.h" -#include "GRHydro_InterfacesM.h" #include "GRHydro_Macros.h" #define ITER_TOL (1.0e-8) File [modified]: GRHydro_Interfaces.h Delta lines: +0 -107 =================================================================== --- branches/ET_2013_05/src/GRHydro_Interfaces.h 2013-05-17 03:30:28 UTC (rev 520) +++ branches/ET_2013_05/src/GRHydro_Interfaces.h 2013-05-17 03:43:54 UTC (rev 521) @@ -1,107 +0,0 @@ -module Con2Prim_fortran_interfaces - implicit none - - interface - - subroutine Con2Prim_pt(handle, & - dens, & - sx, sy, sz, & - tau, & - rho, & - velx, vely, velz, & - epsilon, press, & - w_lorentz, & - uxx, uxy, uxz, & - uyy, uyz, uzz, & - det, & - x, y, z, r, & - epsnegative, & - GRHydro_rho_min, pmin, epsmin, & - GRHydro_reflevel, GRHydro_C2P_failed) - - implicit none - CCTK_INT handle - CCTK_REAL dens - CCTK_REAL sx, sy, sz - CCTK_REAL tau - CCTK_REAL rho - CCTK_REAL velx, vely, velz - CCTK_REAL epsilon, press - CCTK_REAL w_lorentz - CCTK_REAL uxx, uxy, uxz - CCTK_REAL uyy, uyz, uzz - CCTK_REAL det - CCTK_REAL x, y, z, r - logical epsnegative - CCTK_REAL GRHydro_rho_min, pmin, epsmin - CCTK_INT GRHydro_reflevel - CCTK_REAL GRHydro_C2P_failed - end subroutine Con2Prim_pt - - subroutine Con2Prim_ptPolytype(GRHydro_polytrope_handle, & - dens, & - sx, sy, sz, & - tau, & - rho, & - velx, vely, velz, & - eps, press, & - w_lorentz, & - uxx, uxy, uxz, uyy, uyz, uzz, & - det, & - x, y, z, r, & - GRHydro_rho_min, & - GRHydro_reflevel, GRHydro_C2P_failed) - - implicit none - CCTK_INT GRHydro_polytrope_handle - CCTK_REAL dens - CCTK_REAL sx, sy, sz - CCTK_REAL tau - CCTK_REAL rho - CCTK_REAL velx, vely, velz - CCTK_REAL eps, press - CCTK_REAL w_lorentz - CCTK_REAL uxx, uxy, uxz - CCTK_REAL uyy, uyz, uzz - CCTK_REAL det - CCTK_REAL x, y, z, r - CCTK_REAL GRHydro_rho_min - CCTK_INT GRHydro_reflevel - CCTK_REAL GRHydro_C2P_failed - end subroutine Con2Prim_ptPolytype - - subroutine Con2Prim_ptTracer(cons_tracer, tracer, dens) - implicit none - CCTK_REAL cons_tracer, tracer, dens - end subroutine Con2Prim_ptTracer - - subroutine Con2Prim_ptBoundsTracer(cons_tracer, tracer, rho, one_over_w_lorentz, det) - implicit none - CCTK_REAL cons_tracer, tracer, rho, one_over_w_lorentz, det - end subroutine Con2Prim_ptBoundsTracer - - end interface - -end module Con2Prim_fortran_interfaces - -module Eigenproblem_interfaces - implicit none - - interface - - subroutine eigenvalues(handle,rho,velx,vely,velz,eps,w_lorentz,& - lam,gxx,gxy,gxz,gyy,gyz,gzz,u,alp,beta) - - implicit none - - CCTK_REAL rho,velx,vely,velz,eps,w_lorentz - CCTK_REAL lam(5) - CCTK_REAL gxx,gxy,gxz,gyy,gyz,gzz - CCTK_REAL alp,beta,u - CCTK_INT handle - end subroutine - - end interface - -end module Eigenproblem_interfaces - File [modified]: GRHydro_InterfacesAM.h Delta lines: +0 -95 =================================================================== --- branches/ET_2013_05/src/GRHydro_InterfacesAM.h 2013-05-17 03:30:28 UTC (rev 520) +++ branches/ET_2013_05/src/GRHydro_InterfacesAM.h 2013-05-17 03:43:54 UTC (rev 521) @@ -1,95 +0,0 @@ -module Con2PrimAM_fortran_interfaces - implicit none - - interface - - subroutine GRHydro_Con2PrimM_pt( handle, keytemp, prec, & - local_gam, dens, & - sx, sy, sz, & - tau, & - Bconsx, Bconsy, Bconsz, & - xye, xtemp, & - rho, & - velx, vely, velz,& - epsilon, pressure,& - Bx, By, Bz, & - bsq,& - w_lorentz, & - gxx, gxy, gxz, & - gyy, gyz, gzz, & - uxx, uxy, uxz,& - uyy, uyz, uzz,& - det,& - epsnegative, & - retval) - - implicit none - CCTK_INT handle - CCTK_INT keytemp - CCTK_REAL prec - CCTK_REAL local_gam - CCTK_REAL dens - CCTK_REAL sx, sy, sz - CCTK_REAL tau - CCTK_REAL Bconsx, Bconsy, Bconsz - CCTK_REAL xye - CCTK_REAL xtemp - CCTK_REAL rho - CCTK_REAL velx, vely, velz - CCTK_REAL epsilon, pressure - CCTK_REAL Bx, By, Bz - CCTK_REAL bsq - CCTK_REAL w_lorentz - CCTK_REAL gxx, gxy, gxz - CCTK_REAL gyy, gyz, gzz - CCTK_REAL uxx, uxy, uxz - CCTK_REAL uyy, uyz, uzz - CCTK_REAL det - CCTK_INT epsnegative - CCTK_REAL retval - end subroutine GRHydro_Con2PrimM_pt - - subroutine GRHydro_Con2PrimM_Polytype_pt( handle, local_gam,& - dens, & - sx, sy, sz, & - sc, & - Bconsx, Bconsy, Bconsz, & - rho, & - velx, vely, velz,& - epsilon, pressure,& - Bx, By, Bz, & - bsq,& - w_lorentz, & - gxx, gxy, gxz, & - gyy, gyz, gzz, & - uxx, uxy, uxz,& - uyy, uyz, uzz,& - det,& - epsnegative, & - retval) - - implicit none - CCTK_INT handle - CCTK_REAL local_gam - CCTK_REAL dens - CCTK_REAL sx, sy, sz - CCTK_REAL sc - CCTK_REAL Bconsx, Bconsy, Bconsz - CCTK_REAL rho - CCTK_REAL velx, vely, velz - CCTK_REAL epsilon, pressure - CCTK_REAL Bx, By, Bz - CCTK_REAL bsq - CCTK_REAL w_lorentz - CCTK_REAL gxx, gxy, gxz - CCTK_REAL gyy, gyz, gzz - CCTK_REAL uxx, uxy, uxz - CCTK_REAL uyy, uyz, uzz - CCTK_REAL det - CCTK_INT epsnegative - CCTK_REAL retval - end subroutine GRHydro_Con2PrimM_Polytype_pt - - end interface - -end module Con2PrimAM_fortran_interfaces File [modified]: GRHydro_InterfacesM.h Delta lines: +0 -95 =================================================================== --- branches/ET_2013_05/src/GRHydro_InterfacesM.h 2013-05-17 03:30:28 UTC (rev 520) +++ branches/ET_2013_05/src/GRHydro_InterfacesM.h 2013-05-17 03:43:54 UTC (rev 521) @@ -1,95 +0,0 @@ -module Con2PrimM_fortran_interfaces - implicit none - - interface - - subroutine GRHydro_Con2PrimM_pt( handle, keytemp, prec, & - local_gam, dens, & - sx, sy, sz, & - tau, & - Bconsx, Bconsy, Bconsz, & - xye, xtemp, & - rho, & - velx, vely, velz,& - epsilon, pressure,& - Bx, By, Bz, & - bsq,& - w_lorentz, & - gxx, gxy, gxz, & - gyy, gyz, gzz, & - uxx, uxy, uxz,& - uyy, uyz, uzz,& - det,& - epsnegative, & - retval) - - implicit none - CCTK_INT handle - CCTK_INT keytemp - CCTK_REAL prec - CCTK_REAL local_gam - CCTK_REAL dens - CCTK_REAL sx, sy, sz - CCTK_REAL tau - CCTK_REAL Bconsx, Bconsy, Bconsz - CCTK_REAL xye - CCTK_REAL xtemp - CCTK_REAL rho - CCTK_REAL velx, vely, velz - CCTK_REAL epsilon, pressure - CCTK_REAL Bx, By, Bz - CCTK_REAL bsq - CCTK_REAL w_lorentz - CCTK_REAL gxx, gxy, gxz - CCTK_REAL gyy, gyz, gzz - CCTK_REAL uxx, uxy, uxz - CCTK_REAL uyy, uyz, uzz - CCTK_REAL det - CCTK_INT epsnegative - CCTK_REAL retval - end subroutine GRHydro_Con2PrimM_pt - - subroutine GRHydro_Con2PrimM_Polytype_pt( handle, local_gam,& - dens, & - sx, sy, sz, & - sc, & - Bconsx, Bconsy, Bconsz, & - rho, & - velx, vely, velz,& - epsilon, pressure,& - Bx, By, Bz, & - bsq,& - w_lorentz, & - gxx, gxy, gxz, & - gyy, gyz, gzz, & - uxx, uxy, uxz,& - uyy, uyz, uzz,& - det,& - epsnegative, & - retval) - - implicit none - CCTK_INT handle - CCTK_REAL local_gam - CCTK_REAL dens - CCTK_REAL sx, sy, sz - CCTK_REAL sc - CCTK_REAL Bconsx, Bconsy, Bconsz - CCTK_REAL rho - CCTK_REAL velx, vely, velz - CCTK_REAL epsilon, pressure - CCTK_REAL Bx, By, Bz - CCTK_REAL bsq - CCTK_REAL w_lorentz - CCTK_REAL gxx, gxy, gxz - CCTK_REAL gyy, gyz, gzz - CCTK_REAL uxx, uxy, uxz - CCTK_REAL uyy, uyz, uzz - CCTK_REAL det - CCTK_INT epsnegative - CCTK_REAL retval - end subroutine GRHydro_Con2PrimM_Polytype_pt - - end interface - -end module Con2PrimM_fortran_interfaces File [modified]: make.code.defn Delta lines: +3 -1 =================================================================== --- branches/ET_2013_05/src/make.code.defn 2013-05-17 03:30:28 UTC (rev 520) +++ branches/ET_2013_05/src/make.code.defn 2013-05-17 03:43:54 UTC (rev 521) @@ -76,7 +76,9 @@ GRHydro_EvolutionMask.F90\ GRHydro_WENOReconstruct.F90\ GRHydro_WENOScalars.F90 \ - GRHydro_MP5Reconstruct.F90 + GRHydro_MP5Reconstruct.F90 \ + Con2Prim_fortran_interfaces.F90 \ + Con2PrimM_fortran_interfaces.F90 # Subdirectories containing source files SUBDIRS =

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 520)
by rhaas＠tapir.caltech.edu 16 May '13

16 May '13

User: rhaas Date: 2013/05/16 10:30 PM Modified: /trunk/src/ GRHydro_Con2Prim.F90, GRHydro_Con2PrimM.F90, make.code.defn Log: GRHydro: relace C-style include for module with proper module the C-like coding had some problems, in particular it would compile the same module more than once and would circumvent Cactus' module dependency tracking. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +0 -1 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2013-05-13 18:58:17 UTC (rev 519) +++ trunk/src/GRHydro_Con2Prim.F90 2013-05-17 03:30:28 UTC (rev 520) @@ -11,7 +11,6 @@ #include "cctk_Arguments.h" #include "cctk_Functions.h" #include "SpaceMask.h" -#include "GRHydro_Interfaces.h" #include "GRHydro_Macros.h" /*@@ File [modified]: GRHydro_Con2PrimM.F90 Delta lines: +0 -1 =================================================================== --- trunk/src/GRHydro_Con2PrimM.F90 2013-05-13 18:58:17 UTC (rev 519) +++ trunk/src/GRHydro_Con2PrimM.F90 2013-05-17 03:30:28 UTC (rev 520) @@ -12,7 +12,6 @@ #include "cctk_Arguments.h" #include "cctk_Functions.h" #include "SpaceMask.h" -#include "GRHydro_InterfacesM.h" #include "GRHydro_Macros.h" #define ITER_TOL (1.0e-8) File [modified]: make.code.defn Delta lines: +3 -1 =================================================================== --- trunk/src/make.code.defn 2013-05-13 18:58:17 UTC (rev 519) +++ trunk/src/make.code.defn 2013-05-17 03:30:28 UTC (rev 520) @@ -78,7 +78,9 @@ GRHydro_EvolutionMask.F90\ GRHydro_WENOReconstruct.F90\ GRHydro_WENOScalars.F90 \ - GRHydro_MP5Reconstruct.F90 + GRHydro_MP5Reconstruct.F90 \ + Con2Prim_fortran_interfaces.F90 \ + Con2PrimM_fortran_interfaces.F90 # Subdirectories containing source files SUBDIRS =

1 0

[svn:einsteintoolkit] HydroBase/ (Rev. 63)
by rhaas＠tapir.caltech.edu 15 May '13

15 May '13

User: rhaas Date: 2013/05/15 03:49 PM Modified: /branches/ET_2013_05/ param.ccl Log: extent ID keywords by "read from file" if given, we do nothing and assume the user uses IOUtil's filereader capability to read in ID from disk. Directory Changes: Directory: /branches/ET_2013_05/ ================================ Property changes on: branches/ET_2013_05 ___________________________________________________________________ Directory: /svn:mergeinfo/ ========================== + /trunk:62 File Changes: Directory: /branches/ET_2013_05/ ================================ File [modified]: param.ccl Delta lines: +6 -0 =================================================================== --- branches/ET_2013_05/param.ccl 2013-05-15 20:46:57 UTC (rev 62) +++ branches/ET_2013_05/param.ccl 2013-05-15 20:49:51 UTC (rev 63) @@ -34,6 +34,7 @@ { "none" :: "inactive" "one" :: "initially set to one" + "read from file" :: "do nothing, filereader will provide data" } "none" KEYWORD Y_e_evolution_method "Evolution method for Y_e" @@ -57,18 +58,21 @@ { "none" :: "inactive" "zero" :: "initially set to zero" + "read from file" :: "do nothing, filereader will provide data" } "none" KEYWORD initial_Avec "Initial value for Avec" { "none" :: "inactive" "zero" :: "initially set to zero" + "read from file" :: "do nothing, filereader will provide data" } "none" KEYWORD initial_Aphi "Initial value for Aphi" { "none" :: "inactive" "zero" :: "initially set to zero" + "read from file" :: "do nothing, filereader will provide data" } "none" KEYWORD Bvec_evolution_method "Evolution method for Bvec" @@ -87,12 +91,14 @@ { "none" :: "inactive" "zero" :: "initially set to zero" + "read from file" :: "do nothing, filereader will provide data" } "none" KEYWORD initial_entropy "Initial value for entropy" { "none" :: "inactive" "zero" :: "initially set to zero" + "read from file" :: "do nothing, filereader will provide data" } "none"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits