Commits January 2011

commits@lists.einsteintoolkit.org

7 participants
57 discussions

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

03 Jan '11

User: hinder Date: 2011/01/03 12:50 PM Added: /trunk/ configuration.ccl Modified: /trunk/ interface.ccl, param.ccl /trunk/src/ multipole.cc, utils.cc, utils.hh Log: Add HDF5 output support One HDF5 file per variable, and one extensible dataset per radius per mode. HDF5 is required only optionally, so this thorn can be compiled without it. File Changes: Directory: /trunk/src/ ====================== File [modified]: multipole.cc Delta lines: +21 -8 =================================================================== --- trunk/src/multipole.cc 2011-01-03 18:50:31 UTC (rev 73) +++ trunk/src/multipole.cc 2011-01-03 18:50:53 UTC (rev 74) @@ -97,16 +97,29 @@ static void output_mode(CCTK_ARGUMENTS, const variable_desc *v, CCTK_REAL rad, CCTK_REAL real_lm, CCTK_REAL imag_lm, int l, int m) { - DECLARE_CCTK_ARGUMENTS - DECLARE_CCTK_PARAMETERS + DECLARE_CCTK_ARGUMENTS; + DECLARE_CCTK_PARAMETERS; - if (CCTK_MyProc(cctkGH) == 0) + if (output_ascii) { - ostringstream name; - name << "mp_" << v->name << "_l" << l << "_m" << m << - "_r" << setiosflags(ios::fixed) << setprecision(2) << rad << ".asc"; - Multipole_OutputComplexToFile(CCTK_PASS_CTOC, name.str(), real_lm, imag_lm); + if (CCTK_MyProc(cctkGH) == 0) + { + ostringstream name; + name << "mp_" << v->name << "_l" << l << "_m" << m << + "_r" << setiosflags(ios::fixed) << setprecision(2) << rad << ".asc"; + Multipole_OutputComplexToFile(CCTK_PASS_CTOC, name.str(), real_lm, imag_lm); + } } + if (output_hdf5) + { + if (CCTK_MyProc(cctkGH) == 0) + { + ostringstream h5datasetname; + h5datasetname << "l" << l << "_m" << m << "_r" << setiosflags(ios::fixed) << setprecision(2) << rad; + Multipole_OutputComplexToH5File(CCTK_PASS_CTOC, "mp_" + v->name + ".h5", h5datasetname.str(), + real_lm, imag_lm); + } + } } static void output_1D(CCTK_ARGUMENTS, const variable_desc *v, CCTK_REAL rad, @@ -116,7 +129,7 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS - if (CCTK_MyProc(cctkGH) == 0) + if (CCTK_MyProc(cctkGH) == 0 && output_ascii) { if (out_1d_every != 0 && cctk_iteration % out_1d_every == 0) { File [modified]: utils.cc Delta lines: +120 -0 =================================================================== --- trunk/src/utils.cc 2011-01-03 18:50:31 UTC (rev 73) +++ trunk/src/utils.cc 2011-01-03 18:50:53 UTC (rev 74) @@ -2,12 +2,25 @@ #include <string.h> #include <math.h> #include <string> +#include <sys/stat.h> +#include <errno.h> #include <iostream> #include "cctk.h" #include "cctk_Arguments.h" #include "cctk_Parameters.h" +#ifdef HAVE_CAPABILITY_HDF5 +// We currently support the HDF5 1.6 API (and when using 1.8 the +// compatibility mode introduced by H5_USE_16_API). Several machines +// in SimFactory use HDF5 1.6, so we cannot drop support for it. It +// seems it is hard to support both the 1.6 and 1.8 API +// simultaneously; for example H5Fopen takes a different number of +// arguments in the two versions. +#define H5_USE_16_API +#include <hdf5.h> +#endif + #include "utils.hh" #include "integrate.hh" @@ -133,7 +146,114 @@ } } +//////////////////////////////////////////////////////////////////////// +// HDF5 complex output +//////////////////////////////////////////////////////////////////////// +#ifdef HAVE_CAPABILITY_HDF5 + +bool dataset_exists(hid_t file, const string &dataset_name) +{ + // To test whether a dataset exists, the recommended way in API 1.6 + // is to use H5Gget_objinfo, but this prints an error to stderr if + // the dataset does not exist. We explicitly avoid this by wrapping + // the call in H5E_BEGIN_TRY/H5E_END_TRY statements. In 1.8, + // H5Gget_objinfo is deprecated, and H5Lexists does the job. See + // http://www.mail-archive.com/hdf-forum@hdfgroup.org/msg00125.html + + #if 1 + bool exists; + H5E_BEGIN_TRY + { + exists = H5Gget_objinfo(file, dataset_name.c_str(), 1, NULL) >= 0; + } + H5E_END_TRY; + return exists; + #else + return H5Lexists(file, dataset_name.c_str(), H5P_DEFAULT); + #endif +} + +void Multipole_OutputComplexToH5File(CCTK_ARGUMENTS, const string &basename, const string &datasetname, + CCTK_REAL redata, CCTK_REAL imdata) +{ + DECLARE_CCTK_ARGUMENTS; + DECLARE_CCTK_PARAMETERS; + + string output_name = out_dir + string("/") + basename; + int status = 0; + static int first_time = true; + + hid_t file = + (first_time && IO_TruncateOutputFiles(cctkGH)) ? + H5Fcreate(output_name.c_str(), H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT) : + H5Fopen(output_name.c_str(), H5F_ACC_RDWR, H5P_DEFAULT); + + first_time = false; + + hid_t dataset = -1; + + if (dataset_exists(file, datasetname)) + { + dataset = H5Dopen(file, datasetname.c_str()); + } + else + { + hsize_t dims[2] = {0,3}; + hsize_t maxdims[2] = {H5S_UNLIMITED, 3}; + hid_t dataspace = H5Screate_simple(2, dims, maxdims); + + hid_t cparms = -1; + hsize_t chunk_dims[2] = {hdf5_chunk_size,3}; + cparms = H5Pcreate (H5P_DATASET_CREATE); + status = H5Pset_chunk(cparms, 2, chunk_dims); + + dataset = H5Dcreate(file, datasetname.c_str(), H5T_NATIVE_DOUBLE, dataspace, cparms); + H5Pclose(cparms); + } + + hid_t filespace = H5Dget_space (dataset); + hsize_t filedims[2]; + hsize_t maxdims[2]; + status = H5Sget_simple_extent_dims(filespace, filedims, maxdims); + + filedims[0] += 1; + hsize_t size[2] = {filedims[0], filedims[1]}; + status = H5Dextend (dataset, size); + H5Sclose(filespace); + + /* Select a hyperslab */ + hsize_t offset[2] = {filedims[0]-1, 0}; + hsize_t dims2[2] = {1,3}; + filespace = H5Dget_space (dataset); + status = H5Sselect_hyperslab (filespace, H5S_SELECT_SET, offset, NULL, + dims2, NULL); + + CCTK_REAL data[] = {cctk_time, redata, imdata}; + + hid_t memdataspace = H5Screate_simple(2, dims2, NULL); + + /* Write the data to the hyperslab */ + status = H5Dwrite (dataset, H5T_NATIVE_DOUBLE, memdataspace, filespace, + H5P_DEFAULT, data); + + H5Dclose(dataset); + H5Sclose(filespace); + H5Sclose(memdataspace); + + status = H5Fclose(file); +} + +#else + +void Multipole_OutputComplexToH5File(CCTK_ARGUMENTS, const string &basename, const string &datasetname, + CCTK_REAL redata, CCTK_REAL imdata) +{ + CCTK_WARN(0,"HDF5 output has been requested but Cactus has been compiled without HDF5 support"); +} + +#endif + //////////////////////////////////////////////////////////////////////// // Coordinates //////////////////////////////////////////////////////////////////////// File [modified]: utils.hh Delta lines: +3 -0 =================================================================== --- trunk/src/utils.hh 2011-01-03 18:50:31 UTC (rev 73) +++ trunk/src/utils.hh 2011-01-03 18:50:53 UTC (rev 74) @@ -20,6 +20,9 @@ void Multipole_OutputComplexToFile(CCTK_ARGUMENTS, const string &name, CCTK_REAL redata, CCTK_REAL imdata); +void Multipole_OutputComplexToH5File(CCTK_ARGUMENTS, const string &filename, const string &dataset, + CCTK_REAL redata, CCTK_REAL imdata); + void Multipole_CoordSetup(int ntheta, int nphi, CCTK_REAL xhat[], CCTK_REAL yhat[], CCTK_REAL zhat[], CCTK_REAL th[], Directory: /trunk/ ================== File [added]: configuration.ccl Delta lines: +3 -0 =================================================================== --- trunk/configuration.ccl (rev 0) +++ trunk/configuration.ccl 2011-01-03 18:50:53 UTC (rev 74) @@ -0,0 +1,3 @@ +OPTIONAL HDF5 +{ +} File [modified]: interface.ccl Delta lines: +5 -0 =================================================================== --- trunk/interface.ccl 2011-01-03 18:50:31 UTC (rev 73) +++ trunk/interface.ccl 2011-01-03 18:50:53 UTC (rev 74) @@ -2,6 +2,11 @@ implements: multipole inherits: Grid +CCTK_INT FUNCTION IO_TruncateOutputFiles \ + (CCTK_POINTER_TO_CONST IN GH) + +REQUIRES FUNCTION IO_TruncateOutputFiles + public: CCTK_REAL harmonics type=GF timelevels=1 File [modified]: param.ccl Delta lines: +13 -0 =================================================================== --- trunk/param.ccl 2011-01-03 18:50:31 UTC (rev 73) +++ trunk/param.ccl 2011-01-03 18:50:53 UTC (rev 74) @@ -137,3 +137,16 @@ { -100:* :: "Deprecated" } -100 + +CCTK_BOOLEAN output_ascii "Output a simple ASCII file for each mode at each radius" +{ +} "yes" + +CCTK_BOOLEAN output_hdf5 "Output an HDF5 file for each variable containing one dataset per mode at each radius" +{ +} "no" + +CCTK_INT hdf5_chunk_size "How many iterations to preallocate in extensible HDF5 datasets" +{ + 1:* :: "Any integer" +} 200

1 0

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

03 Jan '11

User: hinder Date: 2011/01/03 12:50 PM Modified: /trunk/ param.ccl /trunk/src/ utils.cc Log: Use IO::out_dir parameter by sharing from implementation rather than via CCTK_ParameterGet File Changes: Directory: /trunk/src/ ====================== File [modified]: utils.cc Delta lines: +1 -8 =================================================================== --- trunk/src/utils.cc 2011-01-03 18:50:17 UTC (rev 72) +++ trunk/src/utils.cc 2011-01-03 18:50:31 UTC (rev 73) @@ -24,16 +24,9 @@ bool first_time = cctk_iteration == 0; const char *mode = first_time ? "w" : "a"; - CCTK_STRING *out_dir = (CCTK_STRING *) CCTK_ParameterGet("out_dir", "IOUtil", NULL); - if (*out_dir == 0) - { - CCTK_WARN(1,"Parameter IOUtil::out_dir not found"); - return 0; - } + string output_name(string(out_dir) + "/" + name); - string output_name(string(*out_dir) + "/" + name); - FILE *fp = fopen(output_name.c_str(), mode); if (fp == 0) Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +4 -0 =================================================================== --- trunk/param.ccl 2011-01-03 18:50:17 UTC (rev 72) +++ trunk/param.ccl 2011-01-03 18:50:31 UTC (rev 73) @@ -1,5 +1,9 @@ #param.ccl for thorn Multipole +shares: IO + +USES STRING out_dir + restricted: #Interpolator params: CCTK_STRING interpolator_name "Which interpolator should I use"

1 0

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

03 Jan '11

User: hinder Date: 2011/01/03 12:50 PM Modified: /trunk/src/ multipole.cc, utils.cc, utils.hh Log: Convert to C++ strings File Changes: Directory: /trunk/src/ ====================== File [modified]: multipole.cc Delta lines: +26 -26 =================================================================== --- trunk/src/multipole.cc 2010-11-21 03:29:03 UTC (rev 71) +++ trunk/src/multipole.cc 2011-01-03 18:50:17 UTC (rev 72) @@ -1,6 +1,8 @@ #include <stdio.h> #include <string.h> #include <assert.h> +#include <string> +#include <iomanip> #include "cctk.h" #include "cctk_Arguments.h" @@ -12,6 +14,8 @@ #include "utils.hh" #include "sphericalharmonic.hh" +using namespace std; + static const int var_name_length = 30; static const int max_vars = 10; @@ -24,7 +28,7 @@ int index; int imag_index; int spin_weight; - char name[var_name_length]; + string name; } variable_desc; @@ -51,7 +55,7 @@ // not present v->imag_index = -1; v->spin_weight = 0; - strcpy(v->name, CCTK_VarName(v->index)); + v->name = string(CCTK_VarName(v->index)); if (optstring != 0) { @@ -60,30 +64,31 @@ if (table >= 0) { const int buffer_length = 256; - char imag_name[buffer_length]; + char buffer[buffer_length]; Util_TableGetInt(table, &v->spin_weight , "sw"); ///////////////////////////////////////////////////////////// CCTK_VInfo(CCTK_THORNSTRING,"spinweight %d", v->spin_weight); ///////////////////////////////////////////////////////////// - if (Util_TableGetString(table, buffer_length, imag_name , "cmplx") >= 0) + if (Util_TableGetString(table, buffer_length, buffer , "cmplx") >= 0) { - v->imag_index = CCTK_VarIndex(imag_name); + v->imag_index = CCTK_VarIndex(buffer); } - Util_TableGetString(table, var_name_length, v->name , "name"); + Util_TableGetString(table, buffer_length, buffer , "name"); + v->name = string(buffer); } } vs->n_vars++; } -static void parse_variables_string(const char *var_string, variable_desc v[max_vars], int *n_variables) +static void parse_variables_string(const string &var_string, variable_desc v[max_vars], int *n_variables) { variables_desc vars; vars.n_vars = 0; vars.vars = v; - int ierr = CCTK_TraverseString(var_string, fill_variable, &vars, CCTK_GROUP_OR_VAR); + int ierr = CCTK_TraverseString(var_string.c_str(), fill_variable, &vars, CCTK_GROUP_OR_VAR); assert(ierr > 0); *n_variables = vars.n_vars; @@ -95,12 +100,12 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS - char name_tmp[1000]; - if (CCTK_MyProc(cctkGH) == 0) { - sprintf(name_tmp, "mp_%s_l%d_m%d_r%1.2f.asc", v->name, l, m, rad); - Multipole_OutputComplexToFile(CCTK_PASS_CTOC, name_tmp, real_lm, imag_lm); + ostringstream name; + name << "mp_" << v->name << "_l" << l << "_m" << m << + "_r" << setiosflags(ios::fixed) << setprecision(2) << rad << ".asc"; + Multipole_OutputComplexToFile(CCTK_PASS_CTOC, name.str(), real_lm, imag_lm); } } @@ -111,26 +116,21 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS - char name_tmp[1000]; - if (CCTK_MyProc(cctkGH) == 0) { if (out_1d_every != 0 && cctk_iteration % out_1d_every == 0) { - const char *real_name = CCTK_VarName(v->index); - sprintf(name_tmp, "mp_%s_r%1.2f.th.asc", real_name, rad); - Multipole_Output1D(CCTK_PASS_CTOC, name_tmp, array_size, th, ph, mp_theta, real); - sprintf(name_tmp, "mp_%s_r%1.2f.ph.asc", real_name, rad); - Multipole_Output1D(CCTK_PASS_CTOC, name_tmp, array_size, th, ph, mp_phi, real); + ostringstream real_base; + real_base << "mp_" << string(CCTK_VarName(v->index)) << "_r" << setiosflags(ios::fixed) << setprecision(2) << rad; + Multipole_Output1D(CCTK_PASS_CTOC, real_base.str()+string(".th.asc"), array_size, th, ph, mp_theta, real); + Multipole_Output1D(CCTK_PASS_CTOC, real_base.str()+string(".ph.asc"), array_size, th, ph, mp_phi, real); if (v->imag_index != -1) { - const char *imag_name = CCTK_VarName(v->imag_index); - sprintf(name_tmp, "mp_%s_r%1.2f.th.asc", imag_name, rad); - Multipole_Output1D(CCTK_PASS_CTOC, name_tmp, array_size, th, ph, mp_theta, imag); - - sprintf(name_tmp, "mp_%s_r%1.2f.ph.asc", imag_name, rad); - Multipole_Output1D(CCTK_PASS_CTOC, name_tmp, array_size, th, ph, mp_phi, imag); + ostringstream imag_base; + imag_base << "mp_" << string(CCTK_VarName(v->imag_index)) << "_r" << setiosflags(ios::fixed) << setprecision(2) << rad; + Multipole_Output1D(CCTK_PASS_CTOC, imag_base.str()+string(".th.asc"), array_size, th, ph, mp_theta, imag); + Multipole_Output1D(CCTK_PASS_CTOC, imag_base.str()+string(".ph.asc"), array_size, th, ph, mp_phi, imag); } } } @@ -285,7 +285,7 @@ yhat = new CCTK_REAL[array_size]; zhat = new CCTK_REAL[array_size]; - parse_variables_string(variables, vars, &n_variables); + parse_variables_string(string(variables), vars, &n_variables); get_spin_weights(vars, n_variables, spin_weights, &n_spin_weights); Multipole_CoordSetup(ntheta, nphi, xhat, yhat, zhat, th, ph); setup_harmonics(spin_weights, n_spin_weights, lmax, th, ph, File [modified]: utils.cc Delta lines: +11 -15 =================================================================== --- trunk/src/utils.cc 2010-11-21 03:29:03 UTC (rev 71) +++ trunk/src/utils.cc 2011-01-03 18:50:17 UTC (rev 72) @@ -1,6 +1,8 @@ #include <stdio.h> #include <string.h> #include <math.h> +#include <string> +#include <iostream> #include "cctk.h" #include "cctk_Arguments.h" @@ -9,19 +11,19 @@ #include "utils.hh" #include "integrate.hh" +using namespace std; + //////////////////////////////////////////////////////////////////////// // File manipulation //////////////////////////////////////////////////////////////////////// -FILE *Multipole_OpenOutputFile(CCTK_ARGUMENTS, char const *name) +FILE *Multipole_OpenOutputFile(CCTK_ARGUMENTS, const string &name) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - const int buf_size = 1024; bool first_time = cctk_iteration == 0; const char *mode = first_time ? "w" : "a"; - char output_name[buf_size]; CCTK_STRING *out_dir = (CCTK_STRING *) CCTK_ParameterGet("out_dir", "IOUtil", NULL); if (*out_dir == 0) @@ -30,19 +32,13 @@ return 0; } - if ((int)strlen(*out_dir)+1 > buf_size) - { - CCTK_WARN(1,"Parameter IOUtil::out_dir is too long"); - return 0; - } + string output_name(string(*out_dir) + "/" + name); - sprintf(output_name, "%s/%s", *out_dir, name); + FILE *fp = fopen(output_name.c_str(), mode); - FILE *fp = fopen(output_name, mode); - if (fp == 0) { - CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING, "Could not open output file %s", output_name); + CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING, (string("Could not open output file ") + output_name).c_str()); } return fp; @@ -72,7 +68,7 @@ } -void Multipole_OutputArrayToFile(CCTK_ARGUMENTS, char *name, int array_size, +void Multipole_OutputArrayToFile(CCTK_ARGUMENTS, const string &name, int array_size, CCTK_REAL const th[], CCTK_REAL const ph[], CCTK_REAL const xs[], CCTK_REAL const ys[], CCTK_REAL const zs[], CCTK_REAL const data[]) @@ -90,7 +86,7 @@ // Misc //////////////////////////////////////////////////////////////////////// -void Multipole_Output1D(CCTK_ARGUMENTS, char const *name, int array_size, +void Multipole_Output1D(CCTK_ARGUMENTS, const string &name, int array_size, CCTK_REAL const th[], CCTK_REAL const ph[], mp_coord coord, CCTK_REAL const data[]) { @@ -133,7 +129,7 @@ fprintf(fp, "%f %.19g %.19g\n", cctk_time, redata, imdata); } -void Multipole_OutputComplexToFile(CCTK_ARGUMENTS, char const *name, CCTK_REAL redata, CCTK_REAL imdata) +void Multipole_OutputComplexToFile(CCTK_ARGUMENTS, const string &name, CCTK_REAL redata, CCTK_REAL imdata) { DECLARE_CCTK_ARGUMENTS; File [modified]: utils.hh Delta lines: +6 -3 =================================================================== --- trunk/src/utils.hh 2010-11-21 03:29:03 UTC (rev 71) +++ trunk/src/utils.hh 2011-01-03 18:50:17 UTC (rev 72) @@ -3,19 +3,22 @@ #define __utils_h #include "cctk.h" +#include <string> +using namespace std; + enum mp_coord {mp_theta, mp_phi}; -void Multipole_OutputArrayToFile(CCTK_ARGUMENTS, char const *name, int array_size, +void Multipole_OutputArrayToFile(CCTK_ARGUMENTS, const string &name, int array_size, CCTK_REAL const th[], CCTK_REAL const ph[], CCTK_REAL const x[], CCTK_REAL const y[], CCTK_REAL const z[], CCTK_REAL const data[]); -void Multipole_Output1D(CCTK_ARGUMENTS, char const *name, int array_size, +void Multipole_Output1D(CCTK_ARGUMENTS, const string &name, int array_size, CCTK_REAL const th[], CCTK_REAL const ph[], mp_coord coord, CCTK_REAL const data[]); -void Multipole_OutputComplexToFile(CCTK_ARGUMENTS, char const *name, CCTK_REAL redata, CCTK_REAL imdata); +void Multipole_OutputComplexToFile(CCTK_ARGUMENTS, const string &name, CCTK_REAL redata, CCTK_REAL imdata); void Multipole_CoordSetup(int ntheta, int nphi, CCTK_REAL xhat[], CCTK_REAL yhat[],

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 206)
by cott＠tapir.caltech.edu 02 Jan '11

02 Jan '11

User: cott Date: 2011/01/02 09:54 AM Modified: /trunk/ schedule.ccl Log: * change scheduling of GRHydro_EOSHandle from local to global. File Changes: Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +2 -0 =================================================================== --- trunk/schedule.ccl 2011-01-01 00:04:02 UTC (rev 205) +++ trunk/schedule.ccl 2011-01-02 15:54:48 UTC (rev 206) @@ -235,11 +235,13 @@ schedule GRHydro_EOSHandle AT CCTK_INITIAL before HydroBase_Initial { LANG: C + OPTIONS: global } "Set the EOS number" schedule GRHydro_EOSHandle AT CCTK_POST_RECOVER_VARIABLES { LANG: C + OPTIONS: global } "Set the EOS number" ####################################

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/par/ (Rev. 120)
by bcmsma＠astro.rit.edu 31 Dec '10

31 Dec '10

User: bmundim Date: 2010/12/31 06:10 PM Added: /trunk/par/ balsara1a.par, c2pM_omni.par, p2cM_omni.par, p2cM_polytype.par Log: Add a few parameter files for MHD testing purposes. File Changes: Directory: /trunk/par/ ====================== File [added]: balsara1a.par Delta lines: +61 -0 =================================================================== --- trunk/par/balsara1a.par (rev 0) +++ trunk/par/balsara1a.par 2011-01-01 00:10:16 UTC (rev 120) @@ -0,0 +1,61 @@ +ActiveThorns = "time MoL cartgrid3d carpetioascii ioutil Fortran boundary hydrobase grhydro grhydro_initdata nanchecker eos_omni CoordBase LoopControl CarpetLib Carpet CarpetIOHDF5 CarpetReduce spacemask ADMCoupling ADMMacros ADMBASE STATICCONFORMAL TMUNUBASE SymBase localreduce CarpetIOBasic initbase GRHydro_InitData" + +#This is a hack. ghost_size should be the same as grhydro::grhydro_stencil. + +driver::ghost_size=3 +grhydro::grhydro_stencil=3 + +time::dtfac = 0.25 + +methodoflines::ODE_Method = "rk2" +methodoflines::MoL_Intermediate_Steps=2 + +#admbase::initial_data="prim2con2prim_test" +#GRHydro_InitData::Bx_init=0.1 +#GRHydro_InitData::By_init=0.12 +#GRHydro_InitData::Bz_init=0.14 +HydroBase::initial_hydro="shocktube" +GRHydro_InitData::shocktube_type="xshock" +GRHydro_InitData::shock_case="Balsara1" + +HydroBase::timelevels=2 +HydroBase::evolution_method="grhydro" +HydroBase::Bvec_evolution_method="grhydro" + +SpaceMask::use_mask="yes" +EOS_Omni::gl_gamma=2.0 +grhydro::recon_method="tvd" +grhydro::method_type="RSA FV" +grhydro::recon_vars="primitive" +grhydro::riemann_solver="HLLE" +grhydro::tvd_limiter="vanleerMC" +grhydro::bound="flat" +grhydro::grhydro_eos_type = "General" +grhydro::grhydro_eos_table="Ideal_Fluid" +grhydro::Grhydro_MaxNumConstrainedVars=13 +grhydro::GRHydro_MaxNumEvolvedVars=10 + +grid::type = "BySpacing" +grid::domain = "full" +grid::dxyz = 0.01 + +driver::global_nx = 150 +driver::global_ny = 10 +driver::global_nz = 10 + +#cactus::cctk_itlast = 40 +cactus::cctk_itlast = 200 + +IO::out_dir = "balsara1a" +#IOBasic::outInfo_every = 1 +#IOBasic::outInfo_vars = "HydroBase::rho" +CarpetIOBasic::outInfo_vars="hydrobase::rho" +CarpetIOBasic::outInfo_every=1 +CarpetIOASCII::out1D_criterion = "time" +CarpetIOASCII::out1D_dt = 0.01 +CarpetIOASCII::out1D_vars = "HydroBase::rho HydroBase::press HydroBase::eps HydroBase::vel grhydro::dens grhydro::tau grhydro::scon HydroBase::Bvec" + +CarpetIOHDF5::out_every = 1 +CarpetIOHDF5::out_vars = "HydroBase::rho HydroBase::press HydroBase::eps HydroBase::vel grhydro::dens grhydro::tau grhydro::scon HydroBase::Bvec" + + File [added]: c2pM_omni.par Delta lines: +54 -0 =================================================================== --- trunk/par/c2pM_omni.par (rev 0) +++ trunk/par/c2pM_omni.par 2011-01-01 00:10:16 UTC (rev 120) @@ -0,0 +1,54 @@ +ActiveThorns = "time MoL cartgrid3d carpetioascii ioutil Fortran boundary hydrobase grhydro grhydro_initdata nanchecker eos_omni CoordBase LoopControl CarpetLib Carpet CarpetReduce spacemask ADMCoupling ADMMacros ADMBASE STATICCONFORMAL TMUNUBASE SymBase localreduce CarpetIOBasic initbase GRHydro_InitData" + +#This is a hack. ghost_size should be the same as grhydro::grhydro_stencil. + +driver::ghost_size=3 +grhydro::grhydro_stencil=3 + +time::dtfac = 0.25 + +methodoflines::ODE_Method = "rk2" +methodoflines::MoL_Intermediate_Steps=2 + +admbase::initial_data="con2prim2con_test" +GRHydro_InitData::Bx_init=0.1 +GRHydro_InitData::By_init=0.12 +GRHydro_InitData::Bz_init=0.14 +HydroBase::initial_hydro="shocktube" +GRHydro_InitData::shocktube_type="xshock" +GRHydro_InitData::shock_case="Simple" + +HydroBase::timelevels=2 +HydroBase::evolution_method="grhydro" +HydroBase::Bvec_evolution_method="grhydro" + +SpaceMask::use_mask="yes" +EOS_Omni::gl_gamma=2.5 +#EOS_Omni::gl_gamma=1.66666666666666 +grhydro::recon_method="ppm" +grhydro::method_type="RSA FV" +grhydro::recon_vars="primitive" +grhydro::riemann_solver="HLLE" +grhydro::tvd_limiter="vanleerMC" +grhydro::bound="flat" +grhydro::grhydro_eos_table="Ideal_Fluid" +grhydro::Grhydro_MaxNumConstrainedVars=13 +grhydro::GRHydro_MaxNumEvolvedVars=9 + +grid::type = "BySpacing" +grid::domain = "full" +grid::dxyz = 0.01 + +driver::global_nx = 200 +driver::global_ny = 7 +driver::global_nz = 7 + +cactus::cctk_itlast = 200 + +IO::out_dir = "grhydro_2c_omni" +#IOBasic::outInfo_every = 1 +#IOBasic::outInfo_vars = "HydroBase::rho" +CarpetIOBasic::outInfo_vars="hydrobase::rho" +CarpetIOBasic::outInfo_every=1 +CarpetIOASCII::out1D_every = 1 +CarpetIOASCII::out1D_vars = "HydroBase::rho HydroBase::press HydroBase::eps HydroBase::vel grhydro::dens grhydro::tau grhydro::scon" File [added]: p2cM_omni.par Delta lines: +54 -0 =================================================================== --- trunk/par/p2cM_omni.par (rev 0) +++ trunk/par/p2cM_omni.par 2011-01-01 00:10:16 UTC (rev 120) @@ -0,0 +1,54 @@ +ActiveThorns = "time MoL cartgrid3d carpetioascii ioutil Fortran boundary hydrobase grhydro grhydro_initdata nanchecker eos_omni CoordBase LoopControl CarpetLib Carpet CarpetReduce spacemask ADMCoupling ADMMacros ADMBASE STATICCONFORMAL TMUNUBASE SymBase localreduce CarpetIOBasic initbase GRHydro_InitData" + +#This is a hack. ghost_size should be the same as grhydro::grhydro_stencil. + +driver::ghost_size=3 +grhydro::grhydro_stencil=3 + +time::dtfac = 0.25 + +methodoflines::ODE_Method = "rk2" +methodoflines::MoL_Intermediate_Steps=2 + +admbase::initial_data="prim2con2prim_test" +GRHydro_InitData::Bx_init=0.1 +GRHydro_InitData::By_init=0.12 +GRHydro_InitData::Bz_init=0.14 +HydroBase::initial_hydro="shocktube" +GRHydro_InitData::shocktube_type="xshock" +GRHydro_InitData::shock_case="Simple" + +HydroBase::timelevels=2 +HydroBase::evolution_method="grhydro" +HydroBase::Bvec_evolution_method="grhydro" + +SpaceMask::use_mask="yes" +EOS_Omni::gl_gamma=2.5 +#EOS_Omni::gl_gamma=1.66666666666666 +grhydro::recon_method="ppm" +grhydro::method_type="RSA FV" +grhydro::recon_vars="primitive" +grhydro::riemann_solver="HLLE" +grhydro::tvd_limiter="vanleerMC" +grhydro::bound="flat" +grhydro::grhydro_eos_table="Ideal_Fluid" +grhydro::Grhydro_MaxNumConstrainedVars=13 +grhydro::GRHydro_MaxNumEvolvedVars=9 + +grid::type = "BySpacing" +grid::domain = "full" +grid::dxyz = 0.01 + +driver::global_nx = 200 +driver::global_ny = 7 +driver::global_nz = 7 + +cactus::cctk_itlast = 200 + +IO::out_dir = "grhydro_2c_omni" +#IOBasic::outInfo_every = 1 +#IOBasic::outInfo_vars = "HydroBase::rho" +CarpetIOBasic::outInfo_vars="hydrobase::rho" +CarpetIOBasic::outInfo_every=1 +CarpetIOASCII::out1D_every = 1 +CarpetIOASCII::out1D_vars = "HydroBase::rho HydroBase::press HydroBase::eps HydroBase::vel grhydro::dens grhydro::tau grhydro::scon" File [added]: p2cM_polytype.par Delta lines: +56 -0 =================================================================== --- trunk/par/p2cM_polytype.par (rev 0) +++ trunk/par/p2cM_polytype.par 2011-01-01 00:10:16 UTC (rev 120) @@ -0,0 +1,56 @@ +ActiveThorns = "time MoL cartgrid3d carpetioascii ioutil Fortran boundary hydrobase grhydro grhydro_initdata nanchecker eos_omni CoordBase LoopControl CarpetLib Carpet CarpetReduce spacemask ADMCoupling ADMMacros ADMBASE STATICCONFORMAL TMUNUBASE SymBase localreduce CarpetIOBasic initbase GRHydro_InitData" + +#This is a hack. ghost_size should be the same as grhydro::grhydro_stencil. + +driver::ghost_size=3 +grhydro::grhydro_stencil=3 + +time::dtfac = 0.25 + +methodoflines::ODE_Method = "rk2" +methodoflines::MoL_Intermediate_Steps=2 + +admbase::initial_data="prim2con2prim_polytype_test" +GRHydro_InitData::Bx_init=0.1 +GRHydro_InitData::By_init=0.12 +GRHydro_InitData::Bz_init=0.14 +HydroBase::initial_hydro="shocktube" +GRHydro_InitData::shocktube_type="xshock" +GRHydro_InitData::shock_case="Simple" + +HydroBase::timelevels=2 +HydroBase::evolution_method="grhydro" +HydroBase::Bvec_evolution_method="grhydro" + +SpaceMask::use_mask="yes" +EOS_Omni::poly_gamma=2.5 +EOS_Omni::poly_gamma_ini=2.5 +EOS_Omni::poly_k = 4.2 +#EOS_Omni::gl_gamma=1.66666666666666 +grhydro::recon_method="ppm" +grhydro::method_type="RSA FV" +grhydro::recon_vars="primitive" +grhydro::riemann_solver="HLLE" +grhydro::tvd_limiter="vanleerMC" +grhydro::bound="flat" +grhydro::grhydro_eos_table="Ideal_Fluid" +grhydro::Grhydro_MaxNumConstrainedVars=13 +grhydro::GRHydro_MaxNumEvolvedVars=9 + +grid::type = "BySpacing" +grid::domain = "full" +grid::dxyz = 0.01 + +driver::global_nx = 200 +driver::global_ny = 7 +driver::global_nz = 7 + +cactus::cctk_itlast = 200 + +IO::out_dir = "grhydro_2c_omni" +#IOBasic::outInfo_every = 1 +#IOBasic::outInfo_vars = "HydroBase::rho" +CarpetIOBasic::outInfo_vars="hydrobase::rho" +CarpetIOBasic::outInfo_every=1 +CarpetIOASCII::out1D_every = 1 +CarpetIOASCII::out1D_vars = "HydroBase::rho HydroBase::press HydroBase::eps HydroBase::vel grhydro::dens grhydro::tau grhydro::scon"

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/ (Rev. 119)
by bcmsma＠astro.rit.edu 31 Dec '10

31 Dec '10

User: bmundim Date: 2010/12/31 06:05 PM Modified: /trunk/ interface.ccl /trunk/src/ GRHydro_C2P2C.F90, GRHydro_C2P2CM.F90, GRHydro_P2C2P.F90, GRHydro_P2C2PM.F90 Log: Clean up a few routines and make them to conform to EOS Omni interface. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_C2P2C.F90 Delta lines: +27 -32 =================================================================== --- trunk/src/GRHydro_C2P2C.F90 2010-12-31 19:07:40 UTC (rev 118) +++ trunk/src/GRHydro_C2P2C.F90 2011-01-01 00:05:34 UTC (rev 119) @@ -10,6 +10,7 @@ #include "cctk.h" #include "cctk_Parameters.h" #include "cctk_Arguments.h" +#include "cctk_Functions.h" /*@@ @routine c2p2c @@ -33,34 +34,26 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS + DECLARE_CCTK_FUNCTIONS - integer didit,i,j,k,nx,ny,nz - CCTK_REAL det - CCTK_REAL uxx,uxy,uxz,uyy,uyz,uzz - CCTK_REAL gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send - CCTK_REAL dens_send,sx_send,sy_send,sz_send,tau_send - CCTK_REAL rho_send,velx_send,vely_send,velz_send,eps_send - CCTK_REAL press_send,w_lorentz_send,x_send,y_send,z_send,r_send - CCTK_REAL pmin, epsmin - CCTK_INT C2P_failed - logical epsnegative + CCTK_REAL :: det + CCTK_REAL :: uxx,uxy,uxz,uyy,uyz,uzz + CCTK_REAL :: gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send + CCTK_REAL :: dens_send,sx_send,sy_send,sz_send,tau_send + CCTK_REAL :: rho_send,velx_send,vely_send,velz_send,eps_send + CCTK_REAL :: press_send,w_lorentz_send,x_send,y_send,z_send,r_send + CCTK_REAL :: C2P_failed + CCTK_INT :: epsnegative ! begin EOS Omni vars - integer :: n = 1 - integer :: keytemp = 0 - integer :: anyerr = 0 - integer :: keyerr(1) = 0 - real*8 :: xpress = 0.0d0 - real*8 :: xeps = 0.0d0 - real*8 :: xtemp = 0.0d0 - real*8 :: xye = 0.0d0 + CCTK_REAL :: pmin(1), epsmin(1), epsval(1) + CCTK_INT :: n,keytemp,anyerr,keyerr(1) + CCTK_REAL :: xpress(1),xtemp(1),xye(1),xeps(1),xrho(1) + n=1;keytemp=0;anyerr=0;keyerr(1)=0 + xpress(1)=0.0d0;xtemp(1)=0.0d0;xye(1)=0.0d0;xeps(1)=0.0d0 ! end EOS Omni vars call CCTK_WARN(1,"This test works only with Ideal_Fluid EoS") - - nx = cctk_lsh(1) - ny = cctk_lsh(2) - nz = cctk_lsh(3) x_send = 0.0d0 y_send = 0.0d0 @@ -93,17 +86,18 @@ press_send = 6.666666666666667d-7 w_lorentz_send = 1.0d0 - epsnegative = .false. + epsnegative = 0 - GRHydro_rho_min = 1.e-10 + xrho = 1.0d-10 + epsval = 1.0d0 call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& - GRHydro_rho_min,1.0d0,xtemp,xye,pmin,keyerr,anyerr) + xrho,epsval,xtemp,xye,pmin,keyerr,anyerr) call EOS_Omni_EpsFromPress(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& - GRHydro_rho_min,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr) + xrho,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr) - C2P_failed = 0 + C2P_failed = 0.0d0 write(*,*) 'C2P2C test: initial values.' write(*,*) ' conservative variables: ' @@ -116,11 +110,11 @@ write(*,*) ' W : ',w_lorentz_send write(*,*) 'C2P2C test: getting the associated primitive variables.' - call Con2Prim_pt(GRHydro_eos_handle,dens_send,sx_send,sy_send,sz_send, & + call Con2PrimGen(GRHydro_eos_handle,dens_send,sx_send,sy_send,sz_send, & tau_send,rho_send,velx_send,vely_send,velz_send, & eps_send,press_send,w_lorentz_send, & uxx,uxy,uxz,uyy,uyz,uzz,det,x_send,y_send,z_send,r_send,& - epsnegative,GRHydro_rho_min, pmin, epsmin, GRHydro_init_data_reflevel,C2P_failed) + epsnegative,xrho(1),pmin(1),epsmin(1),GRHydro_init_data_reflevel,C2P_failed) write(*,*) 'C2P2C test: the primitive variables are' write(*,*) ' primitive variables: ' @@ -133,9 +127,10 @@ write(*,*) ' W : ',w_lorentz_send write(*,*) 'C2P2C test: converting back to conserved variables.' - call prim2con(GRHydro_eos_handle,gxx_send, gxy_send, gxz_send, gyy_send, gyz_send, gzz_send, det, & - dens_send, sx_send, sy_send, sz_send, tau_send, rho_send, & - velx_send, vely_send, velz_send, eps_send, press_send, w_lorentz_send) + call Prim2ConGen(GRHydro_eos_handle, & + gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send,det, & + dens_send,sx_send,sy_send,sz_send,tau_send,rho_send, & + velx_send,vely_send,velz_send,eps_send,press_send,w_lorentz_send) write(*,*) 'C2P2C test: the conserved variables are' write(*,*) ' conservative variables: ' File [modified]: GRHydro_C2P2CM.F90 Delta lines: +21 -34 =================================================================== --- trunk/src/GRHydro_C2P2CM.F90 2010-12-31 19:07:40 UTC (rev 118) +++ trunk/src/GRHydro_C2P2CM.F90 2011-01-01 00:05:34 UTC (rev 119) @@ -37,33 +37,25 @@ DECLARE_CCTK_PARAMETERS DECLARE_CCTK_FUNCTIONS - integer didit,i,j,k,nx,ny,nz - CCTK_REAL det - CCTK_REAL uxx,uxy,uxz,uyy,uyz,uzz - CCTK_REAL gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send - CCTK_REAL dens_send,sx_send,sy_send,sz_send,tau_send - CCTK_REAL rho_send,velx_send,vely_send,velz_send,eps_send - CCTK_REAL press_send,w_lorentz_send,x_send,y_send,z_send,r_send - CCTK_REAL bvcx_send, bvcy_send, bvcz_send, b2_send - CCTK_REAL :: pmin(1), epsmin(1), local_gam(1) - CCTK_REAL C2P_failed - CCTK_INT epsnegative + CCTK_REAL :: det + CCTK_REAL :: uxx,uxy,uxz,uyy,uyz,uzz + CCTK_REAL :: gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send + CCTK_REAL :: dens_send,sx_send,sy_send,sz_send,tau_send + CCTK_REAL :: rho_send,velx_send,vely_send,velz_send,eps_send + CCTK_REAL :: press_send,w_lorentz_send,x_send,y_send,z_send,r_send + CCTK_REAL :: bvcx_send, bvcy_send, bvcz_send, b2_send + CCTK_REAL :: C2P_failed + CCTK_INT :: epsnegative - CCTK_REAL :: rhoval(1), epsval(1) - CCTK_REAL :: gamval - ! begin EOS Omni vars - integer :: n,keytemp,anyerr,keyerr(1) - real*8 :: xpress(1),xtemp(1),xye(1),xeps(1),xrho(1) + CCTK_REAL :: pmin(1), epsmin(1), local_gam(1), epsval(1) + CCTK_INT :: n,keytemp,anyerr,keyerr(1) + CCTK_REAL :: xpress(1),xtemp(1),xye(1),xeps(1),xrho(1) n=1;keytemp=0;anyerr=0;keyerr(1)=0 xpress(1)=0.0d0;xtemp(1)=0.0d0;xye(1)=0.0d0;xeps(1)=0.0d0 ! end EOS Omni vars call CCTK_WARN(1,"This test works only with Ideal_Fluid EoS") - - nx = cctk_lsh(1) - ny = cctk_lsh(2) - nz = cctk_lsh(3) x_send = 0.0d0 y_send = 0.0d0 @@ -106,25 +98,22 @@ press_send = 6.666666666666667d-7 w_lorentz_send = 1.0d0 -! epsnegative = .false. epsnegative = 0 - GRHydro_rho_min = 1.0d-10 - rhoval(1) = GRHydro_rho_min - epsval(1) = 1.0d0 + xrho = 1.0d-10 + epsval = 1.0d0 call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& - rhoval,epsval,xtemp,xye,pmin,keyerr,anyerr) + xrho,epsval,xtemp,xye,pmin,keyerr,anyerr) call EOS_Omni_EpsFromPress(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& - rhoval,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr) + xrho,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr) - local_gam(1)=0.0d0 - rhoval(1) = 1.0d0 + local_gam = 0.0d0 + xrho = 1.0d0 call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& - rhoval,epsval,xtemp,xye,local_gam,keyerr,anyerr) - local_gam(1) = local_gam(1)+1.0 - gamval = local_gam(1) + xrho,epsval,xtemp,xye,local_gam,keyerr,anyerr) + local_gam = local_gam + 1.0 C2P_failed = 0.0d0 @@ -142,8 +131,7 @@ write(*,*) ' Bvecz : ',bvcz_send write(*,*) 'C2P2CM test: getting the associated primitive variables.' -! call GRHydro_Con2PrimM_pt(GRHydro_eos_handle,local_gam,dens_send,sx_send,sy_send,sz_send, & - call Con2PrimGenM(GRHydro_eos_handle,gamval,dens_send,sx_send,sy_send,sz_send, & + call Con2PrimGenM(GRHydro_eos_handle,local_gam(1),dens_send,sx_send,sy_send,sz_send, & tau_send,rho_send,velx_send,vely_send,velz_send, & eps_send,press_send,w_lorentz_send, & gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send,& @@ -166,7 +154,6 @@ write(*,*) ' C2P_failed : ',C2P_failed write(*,*) 'C2P2CM test: converting back to conserved variables.' -! call prim2conM(GRHydro_eos_handle,gxx_send, gxy_send, gxz_send, gyy_send, gyz_send, gzz_send, det, & call Prim2ConGenM(GRHydro_eos_handle,gxx_send, gxy_send, gxz_send, gyy_send, gyz_send, gzz_send, det, & dens_send, sx_send, sy_send, sz_send, tau_send, bvcx_send, bvcy_send, bvcz_send, rho_send, & velx_send, vely_send, velz_send, eps_send, press_send, w_lorentz_send) File [modified]: GRHydro_P2C2P.F90 Delta lines: +29 -34 =================================================================== --- trunk/src/GRHydro_P2C2P.F90 2010-12-31 19:07:40 UTC (rev 118) +++ trunk/src/GRHydro_P2C2P.F90 2011-01-01 00:05:34 UTC (rev 119) @@ -10,6 +10,7 @@ #include "cctk.h" #include "cctk_Parameters.h" #include "cctk_Arguments.h" +#include "cctk_Functions.h" /*@@ @routine p2c2p @@ -33,34 +34,26 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS + DECLARE_CCTK_FUNCTIONS - integer didit,i,j,k,nx,ny,nz - CCTK_REAL det - CCTK_REAL uxx,uxy,uxz,uyy,uyz,uzz - CCTK_REAL gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send - CCTK_REAL dens_send,sx_send,sy_send,sz_send,tau_send - CCTK_REAL rho_send,velx_send,vely_send,velz_send,eps_send - CCTK_REAL press_send,w_lorentz_send,x_send,y_send,z_send,r_send - CCTK_REAL pmin, epsmin - CCTK_INT C2P_failed - logical epsnegative + CCTK_REAL :: det + CCTK_REAL :: uxx,uxy,uxz,uyy,uyz,uzz + CCTK_REAL :: gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send + CCTK_REAL :: dens_send,sx_send,sy_send,sz_send,tau_send + CCTK_REAL :: rho_send(1),velx_send,vely_send,velz_send,eps_send(1) + CCTK_REAL :: press_send(1),w_lorentz_send,x_send,y_send,z_send,r_send + CCTK_REAL :: C2P_failed + CCTK_INT :: epsnegative ! begin EOS Omni vars - integer :: n = 1 - integer :: keytemp = 0 - integer :: anyerr = 0 - integer :: keyerr(1) = 0 - real*8 :: xpress = 0.0d0 - real*8 :: xeps = 0.0d0 - real*8 :: xtemp = 0.0d0 - real*8 :: xye = 0.0d0 + CCTK_REAL :: pmin(1), epsmin(1), epsval(1) + CCTK_INT :: n,keytemp,anyerr,keyerr(1) + CCTK_REAL :: xpress(1),xtemp(1),xye(1),xeps(1),xrho(1) + n=1;keytemp=0;anyerr=0;keyerr(1)=0 + xpress(1)=0.0d0;xtemp(1)=0.0d0;xye(1)=0.0d0;xeps(1)=0.0d0 ! end EOS Omni vars call CCTK_WARN(1,"This test works only with Ideal_Fluid EoS") - - nx = cctk_lsh(1) - ny = cctk_lsh(2) - nz = cctk_lsh(3) x_send = 0.0d0 y_send = 0.0d0 @@ -91,19 +84,20 @@ w_lorentz_send = 1.d0/sqrt(1.0d0-velx_send*velx_send-vely_send*vely_send-velz_send*velz_send) - epsnegative = .false. + epsnegative = 0 - GRHydro_rho_min = 1.e-10 + xrho = 1.0d-10 + epsval = 1.0d0 call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& rho_send,eps_send,xtemp,xye,press_send,keyerr,anyerr) call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& - GRHydro_rho_min,1.0d0,xtemp,xye,pmin,keyerr,anyerr) + xrho,epsval,xtemp,xye,pmin,keyerr,anyerr) call EOS_Omni_EpsFromPress(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& - GRHydro_rho_min,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr) + xrho,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr) - C2P_failed = 0 + C2P_failed = 0.0d0 write(*,*) 'P2C2P test: the primitive variables are' write(*,*) ' primitive variables: ' @@ -116,9 +110,10 @@ write(*,*) ' W : ',w_lorentz_send write(*,*) 'P2C2P test: converting back to conserved variables.' - call prim2con(GRHydro_eos_handle,gxx_send, gxy_send, gxz_send, gyy_send, gyz_send, gzz_send, det, & - dens_send, sx_send, sy_send, sz_send, tau_send, rho_send, & - velx_send, vely_send, velz_send, eps_send, press_send, w_lorentz_send) + call Prim2ConGen(GRHydro_eos_handle, & + gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send,det, & + dens_send,sx_send,sy_send,sz_send,tau_send,rho_send(1), & + velx_send,vely_send,velz_send,eps_send(1),press_send(1),w_lorentz_send) write(*,*) 'P2C2P test: initial values.' write(*,*) ' conservative variables: ' @@ -131,11 +126,11 @@ write(*,*) ' W : ',w_lorentz_send write(*,*) 'P2C2P test: getting the associated primitive variables.' - call Con2Prim_pt(GRHydro_eos_handle,dens_send,sx_send,sy_send,sz_send, & - tau_send,rho_send,velx_send,vely_send,velz_send, & - eps_send,press_send,w_lorentz_send, & + call Con2PrimGen(GRHydro_eos_handle,dens_send,sx_send,sy_send,sz_send, & + tau_send,rho_send(1),velx_send,vely_send,velz_send, & + eps_send(1),press_send(1),w_lorentz_send, & uxx,uxy,uxz,uyy,uyz,uzz,det,x_send,y_send,z_send,r_send,& - epsnegative,GRHydro_rho_min, pmin, epsmin, GRHydro_init_data_reflevel,C2P_failed) + epsnegative,xrho(1),pmin(1),epsmin(1),GRHydro_init_data_reflevel,C2P_failed) write(*,*) 'P2C2P test: the primitive variables are' write(*,*) ' primitive variables: ' File [modified]: GRHydro_P2C2PM.F90 Delta lines: +34 -36 =================================================================== --- trunk/src/GRHydro_P2C2PM.F90 2010-12-31 19:07:40 UTC (rev 118) +++ trunk/src/GRHydro_P2C2PM.F90 2011-01-01 00:05:34 UTC (rev 119) @@ -10,6 +10,7 @@ #include "cctk.h" #include "cctk_Parameters.h" #include "cctk_Arguments.h" +#include "cctk_Functions.h" /*@@ @routine p2c2pm @@ -33,35 +34,27 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS + DECLARE_CCTK_FUNCTIONS - integer didit,i,j,k,nx,ny,nz - CCTK_REAL det - CCTK_REAL uxx,uxy,uxz,uyy,uyz,uzz - CCTK_REAL gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send - CCTK_REAL dens_send,sx_send,sy_send,sz_send,tau_send - CCTK_REAL rho_send,velx_send,vely_send,velz_send,eps_send - CCTK_REAL press_send,w_lorentz_send,x_send,y_send,z_send,r_send - CCTK_REAL bvcx_send,bvcy_send,bvcz_send,b2_send - CCTK_REAL pmin, epsmin, local_gam - CCTK_INT C2P_failed - logical epsnegative + CCTK_REAL :: det + CCTK_REAL :: uxx,uxy,uxz,uyy,uyz,uzz + CCTK_REAL :: gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send + CCTK_REAL :: dens_send,sx_send,sy_send,sz_send,tau_send + CCTK_REAL :: rho_send(1),velx_send,vely_send,velz_send,eps_send(1) + CCTK_REAL :: press_send(1),w_lorentz_send,x_send,y_send,z_send,r_send + CCTK_REAL :: bvcx_send,bvcy_send,bvcz_send,b2_send + CCTK_REAL :: C2P_failed + CCTK_INT :: epsnegative ! begin EOS Omni vars - integer :: n = 1 - integer :: keytemp = 0 - integer :: anyerr = 0 - integer :: keyerr(1) = 0 - real*8 :: xpress = 0.0d0 - real*8 :: xeps = 0.0d0 - real*8 :: xtemp = 0.0d0 - real*8 :: xye = 0.0d0 + CCTK_REAL :: pmin(1), epsmin(1), local_gam(1), epsval(1) + CCTK_INT :: n,keytemp,anyerr,keyerr(1) + CCTK_REAL :: xpress(1),xtemp(1),xye(1),xeps(1),xrho(1) + n=1;keytemp=0;anyerr=0;keyerr(1)=0 + xpress(1)=0.0d0;xtemp(1)=0.0d0;xye(1)=0.0d0;xeps(1)=0.0d0 ! end EOS Omni vars call CCTK_WARN(1,"This test works only with Ideal_Fluid EoS") - - nx = cctk_lsh(1) - ny = cctk_lsh(2) - nz = cctk_lsh(3) x_send = 0.0d0 y_send = 0.0d0 @@ -96,23 +89,26 @@ w_lorentz_send = 1.d0/sqrt(1.0d0-velx_send*velx_send-vely_send*vely_send-velz_send*velz_send) - epsnegative = .false. + epsnegative = 0 - GRHydro_rho_min = 1.e-10 + xrho = 1.0d-10 + epsval = 1.0d0 call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& rho_send,eps_send,xtemp,xye,press_send,keyerr,anyerr) call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& - GRHydro_rho_min,1.0d0,xtemp,xye,pmin,keyerr,anyerr) + xrho,epsval,xtemp,xye,pmin,keyerr,anyerr) call EOS_Omni_EpsFromPress(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& - GRHydro_rho_min,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr) + xrho,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr) + local_gam = 0.0d0 + xrho = 1.0d0 call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& - 1.0d0,1.0d0,xtemp,xye,local_gam,keyerr,anyerr) - local_gam=local_gam+1.0 + xrho,epsval,xtemp,xye,local_gam,keyerr,anyerr) + local_gam = local_gam + 1.0 - C2P_failed = 0 + C2P_failed = 0.0d0 write(*,*) 'P2C2PM test: the primitive variables are' write(*,*) ' primitive variables: ' @@ -128,9 +124,11 @@ write(*,*) ' Bvecz : ',bvcz_send write(*,*) 'P2C2PM test: converting back to conserved variables.' - call prim2conM(GRHydro_eos_handle,gxx_send, gxy_send, gxz_send, gyy_send, gyz_send, gzz_send, det, & - dens_send, sx_send, sy_send, sz_send, tau_send, bvcx_send, bvcy_send, bvcz_send, rho_send, & - velx_send, vely_send, velz_send, eps_send, press_send, w_lorentz_send) + call Prim2ConGenM(GRHydro_eos_handle,& + gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send,det, & + dens_send,sx_send,sy_send,sz_send,tau_send, & + bvcx_send,bvcy_send,bvcz_send,rho_send(1), & + velx_send,vely_send,velz_send,eps_send(1),press_send(1),w_lorentz_send) write(*,*) 'P2C2PM test: initial values.' write(*,*) ' conservative variables: ' @@ -147,9 +145,9 @@ write(*,*) 'P2C2PM test: getting the associated primitive variables.' - call GRHydro_Con2PrimM_pt(GRHydro_eos_handle,local_gam,dens_send,sx_send,sy_send,sz_send, & - tau_send,rho_send,velx_send,vely_send,velz_send, & - eps_send,press_send,w_lorentz_send, & + call Con2PrimGenM(GRHydro_eos_handle,local_gam(1),dens_send,sx_send,sy_send,sz_send, & + tau_send,rho_send(1),velx_send,vely_send,velz_send, & + eps_send(1),press_send(1),w_lorentz_send, & gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send,& uxx,uxy,uxz,uyy,uyz,uzz,det,& bvcx_send,bvcy_send,bvcz_send,b2_send,& Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +18 -0 =================================================================== --- trunk/interface.ccl 2010-12-31 19:07:40 UTC (rev 118) +++ trunk/interface.ccl 2011-01-01 00:05:34 UTC (rev 119) @@ -79,6 +79,23 @@ CCTK_INT IN GRHydro_reflevel, CCTK_REAL IN GRHydro_C2P_failed) +void FUNCTION Con2PrimGen(CCTK_INT INOUT handle, CCTK_REAL INOUT dens, \ + CCTK_REAL INOUT sx, CCTK_REAL INOUT sy, CCTK_REAL INOUT sz, \ + CCTK_REAL INOUT tau, CCTK_REAL INOUT rho, \ + CCTK_REAL INOUT velx, CCTK_REAL INOUT vely, CCTK_REAL INOUT velz, \ + CCTK_REAL INOUT epsilon, CCTK_REAL INOUT pressure, \ + CCTK_REAL INOUT w_lorentz, \ + CCTK_REAL INOUT uxx, CCTK_REAL INOUT uxy, CCTK_REAL INOUT uxz, \ + CCTK_REAL INOUT uyy, CCTK_REAL INOUT uyz, CCTK_REAL INOUT uzz, \ + CCTK_REAL INOUT det, \ + CCTK_REAL INOUT x, CCTK_REAL INOUT y, CCTK_REAL INOUT z, \ + CCTK_REAL INOUT r, \ + CCTK_INT OUT epsnegative, \ + CCTK_REAL INOUT GRHydro_rho_min, CCTK_REAL INOUT pmin, \ + CCTK_REAL INOUT epsmin, \ + CCTK_INT INOUT GRHydro_reflevel, \ + CCTK_REAL OUT retval) + void FUNCTION Con2PrimGenM(CCTK_INT INOUT handle, CCTK_REAL INOUT gamma_eos, CCTK_REAL INOUT dens, \ CCTK_REAL INOUT sx, CCTK_REAL INOUT sy, CCTK_REAL INOUT sz, \ CCTK_REAL INOUT tau, CCTK_REAL INOUT rho, \ @@ -101,6 +118,7 @@ USES FUNCTION Prim2ConPolyM USES FUNCTION Prim2ConGenM USES FUNCTION Con2PrimPoly +USES FUNCTION Con2PrimGen USES FUNCTION Con2PrimGenM CCTK_INT FUNCTION EOS_Omni_GetHandle(CCTK_STRING IN name)

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 205)
by bcmsma＠astro.rit.edu 31 Dec '10

31 Dec '10

User: bmundim Date: 2010/12/31 06:04 PM Modified: /trunk/ interface.ccl Log: Define alias function for Con2Prim_pt. File Changes: Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +18 -0 =================================================================== --- trunk/interface.ccl 2010-12-31 20:03:19 UTC (rev 204) +++ trunk/interface.ccl 2011-01-01 00:04:02 UTC (rev 205) @@ -54,6 +54,23 @@ # CCTK_REAL IN GRHydro_rho_min, CCTK_REAL IN pmin, \ # CCTK_INT IN GRHydro_reflevel, CCTK_REAL IN GRHydro_C2P_failed) +void FUNCTION Con2PrimGen(CCTK_INT INOUT handle, CCTK_REAL INOUT dens, \ + CCTK_REAL INOUT sx, CCTK_REAL INOUT sy, CCTK_REAL INOUT sz, \ + CCTK_REAL INOUT tau, CCTK_REAL INOUT rho, \ + CCTK_REAL INOUT velx, CCTK_REAL INOUT vely, CCTK_REAL INOUT velz, \ + CCTK_REAL INOUT epsilon, CCTK_REAL INOUT pressure, \ + CCTK_REAL INOUT w_lorentz, \ + CCTK_REAL INOUT uxx, CCTK_REAL INOUT uxy, CCTK_REAL INOUT uxz, \ + CCTK_REAL INOUT uyy, CCTK_REAL INOUT uyz, CCTK_REAL INOUT uzz, \ + CCTK_REAL INOUT det, \ + CCTK_REAL INOUT x, CCTK_REAL INOUT y, CCTK_REAL INOUT z, \ + CCTK_REAL INOUT r, \ + CCTK_INT OUT epsnegative, \ + CCTK_REAL INOUT GRHydro_rho_min, CCTK_REAL INOUT pmin, \ + CCTK_REAL INOUT epsmin, \ + CCTK_INT INOUT GRHydro_reflevel, \ + CCTK_REAL OUT retval) + void FUNCTION Con2PrimGenM(CCTK_INT INOUT handle, CCTK_REAL INOUT gamma_eos, CCTK_REAL INOUT dens, \ CCTK_REAL INOUT sx, CCTK_REAL INOUT sy, CCTK_REAL INOUT sz, \ CCTK_REAL INOUT tau, CCTK_REAL INOUT rho, \ @@ -141,6 +158,7 @@ #PROVIDES FUNCTION Con2Prim WITH Con2Prim_pt LANGUAGE Fortran PROVIDES FUNCTION Con2PrimPoly WITH Con2Prim_ptPolytype LANGUAGE Fortran PROVIDES FUNCTION Con2PrimGenM WITH GRHydro_Con2PrimM_pt LANGUAGE Fortran +PROVIDES FUNCTION Con2PrimGen WITH Con2Prim_pt LANGUAGE Fortran PROVIDES FUNCTION Prim2ConGen WITH prim2con LANGUAGE Fortran PROVIDES FUNCTION Prim2ConPoly WITH prim2conpolytype LANGUAGE Fortran PROVIDES FUNCTION Prim2ConGenM WITH prim2conM LANGUAGE Fortran

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits January 2011