Commits October 2013

commits@lists.einsteintoolkit.org

8 participants
87 discussions

[svn:einsteintoolkit] Multipole/trunk/ (Rev. 96)
by ian.hinder＠aei.mpg.de 09 Oct '13

09 Oct '13

User: hinder Date: 2013/10/09 12:56 PM Modified: /trunk/ schedule.ccl /trunk/src/ tests.cc Log: Rename integration convergence test function and run tests only if Multipole::enable_test = yes File Changes: Directory: /trunk/src/ ====================== File [modified]: tests.cc Delta lines: +1 -1 =================================================================== --- trunk/src/tests.cc 2013-10-09 17:56:08 UTC (rev 95) +++ trunk/src/tests.cc 2013-10-09 17:56:16 UTC (rev 96) @@ -53,7 +53,7 @@ return log10(error1/error2) / log10((CCTK_REAL) n2/n1); } -void Multipole_TestSimpson(CCTK_ARGUMENTS) +void Multipole_TestIntegrationConvergence(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; *test_simpson_convergence_order = integration_convergence_order(&Simpson2DIntegral); Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +8 -6 =================================================================== --- trunk/schedule.ccl 2013-10-09 17:56:08 UTC (rev 95) +++ trunk/schedule.ccl 2013-10-09 17:56:16 UTC (rev 96) @@ -1,10 +1,9 @@ #schedule.ccl for thorn Multipole -STORAGE: test_integration_convergence_orders - if (enable_test) { STORAGE: harmonics[1] + STORAGE: test_integration_convergence_orders } schedule Multipole_Calc at CCTK_ANALYSIS after (calc_np,PsiKadelia,Accelerator_CopyBack) @@ -27,9 +26,12 @@ OPTIONS: GLOBAL } "Check Multipole parameters" -# # Tests +# Tests -schedule Multipole_TestSimpson at CCTK_PARAMCHECK +if (enable_test) { - LANG: C -} "Test simpson integration method" + schedule Multipole_TestIntegrationConvergence at CCTK_PARAMCHECK + { + LANG: C + } "Test convergence of integration" +}

1 0

[svn:einsteintoolkit] Multipole/trunk/src/ (Rev. 95)
by ian.hinder＠aei.mpg.de 09 Oct '13

09 Oct '13

User: hinder Date: 2013/10/09 12:56 PM Modified: /trunk/src/ tests.cc Log: tests.cc: Refactor convergence test code File Changes: Directory: /trunk/src/ ====================== File [modified]: tests.cc Delta lines: +12 -9 =================================================================== --- trunk/src/tests.cc 2013-10-09 17:56:00 UTC (rev 94) +++ trunk/src/tests.cc 2013-10-09 17:56:08 UTC (rev 95) @@ -10,7 +10,7 @@ #include "utils.hh" #include "integrate.hh" -static CCTK_REAL test_simpson_integral(int n) +static CCTK_REAL test_integral(int n, CCTK_REAL (*integration_fn) (const CCTK_REAL *, int, int, CCTK_REAL, CCTK_REAL)) { const int nx = n; const int ny = n; @@ -35,27 +35,30 @@ } } - const CCTK_REAL result = Simpson2DIntegral(f, nx, ny, dx, dy); + const CCTK_REAL result = integration_fn(f, nx, ny, dx, dy); delete [] f; return result; } - -void Multipole_TestSimpson(CCTK_ARGUMENTS) +CCTK_REAL integration_convergence_order(CCTK_REAL (*integration_fn) (const CCTK_REAL *, int, int, CCTK_REAL, CCTK_REAL)) { - DECLARE_CCTK_ARGUMENTS; - const int n1 = 100; const int n2 = 200; const CCTK_REAL PI = acos(-1.0); - const CCTK_REAL result1 = test_simpson_integral(100); - const CCTK_REAL result2 = test_simpson_integral(200); + const CCTK_REAL result1 = test_integral(100, integration_fn); + const CCTK_REAL result2 = test_integral(200, integration_fn); const CCTK_REAL exact = 1./24 + 1./(64 * pow(PI,2)); const CCTK_REAL error1 = fabs(result1 - exact); const CCTK_REAL error2 = fabs(result2 - exact); - *test_simpson_convergence_order = log10(error1/error2) / log10((CCTK_REAL) n2/n1); + return log10(error1/error2) / log10((CCTK_REAL) n2/n1); } +void Multipole_TestSimpson(CCTK_ARGUMENTS) +{ + DECLARE_CCTK_ARGUMENTS; + *test_simpson_convergence_order = integration_convergence_order(&Simpson2DIntegral); +} + // void Multipole_TestIntegrate(CCTK_ARGUMENTS) // { // const int n = 100;

1 0

[svn:einsteintoolkit] Multipole/trunk/ (Rev. 94)
by ian.hinder＠aei.mpg.de 09 Oct '13

09 Oct '13

User: hinder Date: 2013/10/09 12:56 PM Added: /trunk/src/ tests.cc /trunk/test/test_simpson/ test_simpson_convergence_order..asc Modified: /trunk/ interface.ccl, schedule.ccl /trunk/src/ make.code.defn /trunk/test/ test_simpson.par Log: Add convergence test for Simpson integration method File Changes: Directory: /trunk/src/ ====================== File [modified]: make.code.defn Delta lines: +1 -1 =================================================================== --- trunk/src/make.code.defn 2013-10-09 17:55:48 UTC (rev 93) +++ trunk/src/make.code.defn 2013-10-09 17:56:00 UTC (rev 94) @@ -1 +1 @@ -SRCS=interpolate.cc multipole.cc utils.cc sphericalharmonic.cc integrate.cc +SRCS=interpolate.cc multipole.cc utils.cc sphericalharmonic.cc integrate.cc tests.cc File [added]: tests.cc Delta lines: +97 -0 =================================================================== --- trunk/src/tests.cc (rev 0) +++ trunk/src/tests.cc 2013-10-09 17:56:00 UTC (rev 94) @@ -0,0 +1,97 @@ +#include <stdio.h> +#include <string.h> +#include <math.h> +#include <assert.h> + +#include "cctk.h" +#include "cctk_Arguments.h" +#include "cctk_Parameters.h" + +#include "utils.hh" +#include "integrate.hh" + +static CCTK_REAL test_simpson_integral(int n) +{ + const int nx = n; + const int ny = n; + const int array_size=(nx+1)*(ny+1); + + CCTK_REAL *f = new CCTK_REAL[array_size]; + + const CCTK_REAL dx = 1./nx; + const CCTK_REAL dy = 1./ny; + + for (int ix = 0; ix <= nx; ix++) + { + for (int iy = 0; iy <= ny; iy++) + { + const int i = Multipole_Index(ix, iy, nx); + + const CCTK_REAL x = ix*dx; + const CCTK_REAL y = iy*dy; + const CCTK_REAL PI = acos(-1.0); + + f[i] = x*pow(y,2)*pow(cos(2*PI*y),2)*pow(sin(2*PI*x),2); + } + } + + const CCTK_REAL result = Simpson2DIntegral(f, nx, ny, dx, dy); + delete [] f; + return result; +} + + +void Multipole_TestSimpson(CCTK_ARGUMENTS) +{ + DECLARE_CCTK_ARGUMENTS; + + const int n1 = 100; + const int n2 = 200; + const CCTK_REAL PI = acos(-1.0); + const CCTK_REAL result1 = test_simpson_integral(100); + const CCTK_REAL result2 = test_simpson_integral(200); + const CCTK_REAL exact = 1./24 + 1./(64 * pow(PI,2)); + const CCTK_REAL error1 = fabs(result1 - exact); + const CCTK_REAL error2 = fabs(result2 - exact); + *test_simpson_convergence_order = log10(error1/error2) / log10((CCTK_REAL) n2/n1); +} + +// void Multipole_TestIntegrate(CCTK_ARGUMENTS) +// { +// const int n = 100; + +// const int nth = n; +// const int nph = n; +// const int array_size=(nth+1)*(nph+1); + +// CCTK_REAL *f = new CCTK_REAL[array_size]; + +// const CCTK_REAL dth = 1/nx; +// const CCTK_REAL dph = 1/ny; + +// for (int ix = 0; ix <= nx; ix++) +// { +// for (int iy = 0; iy <= ny; iy++) +// { +// const int i = Multipole_Index(ix, iy, nx); + +// const CCTK_REAL x = ix*dx; +// const CCTK_REAL y = iy*dy; + +// f[i] = sin(2*PI*x)*cos(2*PI*y); +// } +// } + + + + +// CCTK_REAL result = Multipole_Integrate(int array_size, int nthetap, +// CCTK_REAL const array1r[], CCTK_REAL const array1i[], +// CCTK_REAL const array2r[], CCTK_REAL const array2i[], +// CCTK_REAL const th[], CCTK_REAL const ph[], +// CCTK_REAL *outre, CCTK_REAL *outim) + + + +// printf("Integration result: %.19g\n", result); +// } Directory: /trunk/test/ ======================= File [modified]: test_simpson.par Delta lines: +4 -1 =================================================================== --- trunk/test/test_simpson.par 2013-10-09 17:55:48 UTC (rev 93) +++ trunk/test/test_simpson.par 2013-10-09 17:56:00 UTC (rev 94) @@ -1,5 +1,5 @@ -ActiveThorns = "CoordBase SymBase Boundary CartGrid3d IOUtil Carpet CarpetLib CarpetInterp AEILocalInterp InitBase Multipole LoopControl" +ActiveThorns = "CoordBase SymBase Boundary CartGrid3d IOUtil Carpet CarpetLib CarpetInterp AEILocalInterp InitBase Multipole LoopControl CarpetIOASCII" ############################################################# # Grid @@ -87,3 +87,6 @@ # CarpetIOASCII::out1d_x = yes # CarpetIOASCII::out1d_y = yes # CarpetIOASCII::out1d_z = yes + +CarpetIOASCII::out0d_vars = "Multipole::test_simpson_convergence_order" +CarpetIOASCII::out0d_every = 1 Directory: /trunk/test/test_simpson/ ==================================== File [added]: test_simpson_convergence_order..asc Delta lines: +4 -0 =================================================================== --- trunk/test/test_simpson/test_simpson_convergence_order..asc (rev 0) +++ trunk/test/test_simpson/test_simpson_convergence_order..asc 2013-10-09 17:56:00 UTC (rev 94) @@ -0,0 +1,4 @@ +# 0D ASCII output created by CarpetIOASCII +# +0 0 0 0 0 0 0 0 0 0 0 0 4.00339319061966 + Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +5 -0 =================================================================== --- trunk/interface.ccl 2013-10-09 17:55:48 UTC (rev 93) +++ trunk/interface.ccl 2013-10-09 17:56:00 UTC (rev 94) @@ -13,3 +13,8 @@ { harmonic_re, harmonic_im } "Spherical harmonics" + +CCTK_REAL test_integration_convergence_orders type=SCALAR +{ + test_simpson_convergence_order +} "Test integration convergence orders" File [modified]: schedule.ccl Delta lines: +9 -0 =================================================================== --- trunk/schedule.ccl 2013-10-09 17:55:48 UTC (rev 93) +++ trunk/schedule.ccl 2013-10-09 17:56:00 UTC (rev 94) @@ -1,5 +1,7 @@ #schedule.ccl for thorn Multipole +STORAGE: test_integration_convergence_orders + if (enable_test) { STORAGE: harmonics[1] @@ -24,3 +26,10 @@ LANG: C OPTIONS: GLOBAL } "Check Multipole parameters" + +# # Tests + +schedule Multipole_TestSimpson at CCTK_PARAMCHECK +{ + LANG: C +} "Test simpson integration method"

1 0

[svn:einsteintoolkit] Multipole/trunk/src/ (Rev. 93)
by ian.hinder＠aei.mpg.de 09 Oct '13

09 Oct '13

User: hinder Date: 2013/10/09 12:55 PM Modified: /trunk/src/ utils.cc Log: utils.cc: Treat all integration methods uniformly All tests pass File Changes: Directory: /trunk/src/ ====================== File [modified]: utils.cc Delta lines: +10 -19 =================================================================== --- trunk/src/utils.cc 2013-10-09 17:55:39 UTC (rev 92) +++ trunk/src/utils.cc 2013-10-09 17:55:48 UTC (rev 93) @@ -345,25 +345,10 @@ iu = Multipole_Index(0,1,ntheta); CCTK_REAL dph = ph[iu] - ph[il]; - if (CCTK_Equals(integration_method, "midpoint")) + if (CCTK_Equals(integration_method, "Simpson") || + CCTK_Equals(integration_method, "DriscollHealy") || + CCTK_Equals(integration_method, "midpoint")) { - CCTK_REAL tempr = 0.0; - CCTK_REAL tempi = 0.0; - - for (int i=0; i < array_size; i++) { - // the below calculations take the integral of conj(array1)*array2 - tempr += ( array1r[i]*array2r[i] + array1i[i]*array2i[i] ) - *sin(th[i])*dth*dph; - tempi += ( array1r[i]*array2i[i] - array1i[i]*array2r[i] ) - *sin(th[i])*dth*dph; - - *outre = tempr; - *outim = tempi; - } - } - else if (CCTK_Equals(integration_method, "Simpson") || - CCTK_Equals(integration_method, "DriscollHealy")) - { static CCTK_REAL *fr = 0; static CCTK_REAL *fi = 0; static bool allocated_memory = false; @@ -376,6 +361,7 @@ allocated_memory = true; } + // the below calculations take the integral of conj(array1)*array2*sin(th) for (int i = 0; i < array_size; i++) { fr[i] = (array1r[i] * array2r[i] + @@ -384,8 +370,13 @@ array1i[i] * array2r[i] ) * sin(th[i]); } - if (CCTK_Equals(integration_method, "Simpson")) + if (CCTK_Equals(integration_method, "midpoint")) { + *outre = Midpoint2DIntegral(fr, ntheta, nphi, dth, dph); + *outim = Midpoint2DIntegral(fi, ntheta, nphi, dth, dph); + } + else if (CCTK_Equals(integration_method, "Simpson")) + { if (nphi % 2 != 0 || ntheta % 2 != 0) { CCTK_WARN (CCTK_WARN_ABORT, "The Simpson integration method requires even ntheta and even nphi");

1 0

[svn:einsteintoolkit] Multipole/trunk/src/ (Rev. 92)
by ian.hinder＠aei.mpg.de 09 Oct '13

09 Oct '13

User: hinder Date: 2013/10/09 12:55 PM Modified: /trunk/src/ integrate.cc, integrate.hh Log: Add Midpoint2DIntegral as standalone function File Changes: Directory: /trunk/src/ ====================== File [modified]: integrate.cc Delta lines: +14 -0 =================================================================== --- trunk/src/integrate.cc 2013-10-09 17:55:22 UTC (rev 91) +++ trunk/src/integrate.cc 2013-10-09 17:55:39 UTC (rev 92) @@ -34,6 +34,20 @@ // Hard coded 2D integrals +CCTK_REAL Midpoint2DIntegral(CCTK_REAL const *f, int nx, int ny, CCTK_REAL hx, CCTK_REAL hy) +{ + CCTK_REAL integrand_sum = 0.0; + int ix = 0, iy = 0; + + assert(nx > 0); assert(ny > 0); assert (f); + + for (iy = 0; iy <= ny; iy++) + for (ix = 0; ix <= nx; ix++) + integrand_sum += f[idx(ix,iy)]; + + return hx * hy * integrand_sum; +} + static CCTK_REAL Trapezoidal2DIntegral(CCTK_REAL const *f, int nx, int ny, CCTK_REAL hx, CCTK_REAL hy) { CCTK_REAL integrand_sum = 0.0; File [modified]: integrate.hh Delta lines: +3 -0 =================================================================== --- trunk/src/integrate.hh 2013-10-09 17:55:22 UTC (rev 91) +++ trunk/src/integrate.hh 2013-10-09 17:55:39 UTC (rev 92) @@ -3,6 +3,9 @@ #define __integrate_h #include "cctk.h" +CCTK_REAL Midpoint2DIntegral(CCTK_REAL const *f, int nx, int ny, + CCTK_REAL hx, CCTK_REAL hy); + CCTK_REAL Simpson2DIntegral(CCTK_REAL const *f, int nx, int ny, CCTK_REAL hx, CCTK_REAL hy);

1 0

[svn:einsteintoolkit] Multipole/trunk/test/ (Rev. 91)
by ian.hinder＠aei.mpg.de 09 Oct '13

09 Oct '13

User: hinder Date: 2013/10/09 12:55 PM Modified: /trunk/test/ test_22.par, test_31.par, test_44.par, test_rads.par, test_vars.par Log: Explicitly choose integration method in existing tests This makes it clear which integration method is being used File Changes: Directory: /trunk/test/ ======================= File [modified]: test_22.par Delta lines: +1 -0 =================================================================== --- trunk/test/test_22.par 2013-05-27 22:31:57 UTC (rev 90) +++ trunk/test/test_22.par 2013-10-09 17:55:22 UTC (rev 91) @@ -63,6 +63,7 @@ Multipole::nradii = 1 Multipole::radius[0] = 8.0 Multipole::variables = "Multipole::harmonic_re{sw=-2 cmplx='Multipole::harmonic_im' name='harmonic'}" +Multipole::integration_method = "midpoint" Multipole::enable_test = "yes" Multipole::test_l = 2 File [modified]: test_31.par Delta lines: +1 -0 =================================================================== --- trunk/test/test_31.par 2013-05-27 22:31:57 UTC (rev 90) +++ trunk/test/test_31.par 2013-10-09 17:55:22 UTC (rev 91) @@ -63,6 +63,7 @@ Multipole::nradii = 1 Multipole::radius[0] = 8.0 Multipole::variables = "Multipole::harmonic_re{sw=-2 cmplx='Multipole::harmonic_im' name='harmonic'}" +Multipole::integration_method = "midpoint" Multipole::l_mode = 4 Multipole::m_mode = 4 File [modified]: test_44.par Delta lines: +1 -0 =================================================================== --- trunk/test/test_44.par 2013-05-27 22:31:57 UTC (rev 90) +++ trunk/test/test_44.par 2013-10-09 17:55:22 UTC (rev 91) @@ -65,6 +65,7 @@ Multipole::variables = "Multipole::harmonic_re{sw=-2 cmplx='Multipole::harmonic_im' name='harmonic'}" Multipole::l_mode = 4 Multipole::m_mode = 4 +Multipole::integration_method = "midpoint" Multipole::enable_test = "yes" Multipole::test_l = 4 File [modified]: test_rads.par Delta lines: +1 -0 =================================================================== --- trunk/test/test_rads.par 2013-05-27 22:31:57 UTC (rev 90) +++ trunk/test/test_rads.par 2013-10-09 17:55:22 UTC (rev 91) @@ -65,6 +65,7 @@ Multipole::radius[1] = 6.0 Multipole::radius[2] = 4.0 Multipole::variables = "Multipole::harmonic_re{sw=-2 cmplx='Multipole::harmonic_im' name='harmonic'}" +Multipole::integration_method = "midpoint" Multipole::l_max = 2 Multipole::enable_test = "yes" File [modified]: test_vars.par Delta lines: +1 -0 =================================================================== --- trunk/test/test_vars.par 2013-05-27 22:31:57 UTC (rev 90) +++ trunk/test/test_vars.par 2013-10-09 17:55:22 UTC (rev 91) @@ -64,6 +64,7 @@ Multipole::radius[0] = 8.0 Multipole::variables = "Grid::x Grid::y Grid::z" Multipole::l_max = 2 +Multipole::integration_method = "midpoint" Multipole::out_1d_every = 1

1 0

[svn:einsteintoolkit] www/about/members/ (Rev. 1044)
by knarf＠cct.lsu.edu 07 Oct '13

07 Oct '13

User: knarf Date: 2013/10/07 02:54 PM Modified: /about/members/ members.txt Log: new member File Changes: Directory: /about/members/ ========================== File [modified]: members.txt Delta lines: +1 -0 =================================================================== --- about/members/members.txt 2013-09-18 17:34:56 UTC (rev 1043) +++ about/members/members.txt 2013-10-07 19:54:13 UTC (rev 1044) @@ -138,6 +138,7 @@ http://www.tribhuvan-university.edu.np/ à¤¤à¥à¤°à¤¿à¤à¥à¤µà¤¨ à¤µà¤¿à¤¶à¥à¤µà¤µà¤¿à¤¦à¥à¤¯à¤¾à¤²à¤¯ (Tribhuvan University) Udayaraj Khanal + Tulasi Prasad Subedi http://www.uib.es/ Universitat de les Illes Balears Sascha Husa

1 0

[svn:einsteintoolkit] IllinoisGRMHD/trunk/src/ (Rev. 9)
by zachetie＠gmail.com 07 Oct '13

07 Oct '13

User: zetienne Date: 2013/10/07 11:28 AM Modified: /trunk/src/ driver_conserv_to_prims.C, driver_evaluate_MHD_rhs.C Log: Fix some minor issues in code comments. File Changes: Directory: /trunk/src/ ====================== File [modified]: driver_conserv_to_prims.C Delta lines: +7 -7 =================================================================== --- trunk/src/driver_conserv_to_prims.C 2013-10-07 16:25:07 UTC (rev 8) +++ trunk/src/driver_conserv_to_prims.C 2013-10-07 16:28:00 UTC (rev 9) @@ -1,14 +1,14 @@ /* We evolve forward in time a set of functions called the - * "conservative variables" forward in time, and any time - * the conserv's are updated, we must solve for the - * primitive variables (rho, pressure, velocities) using a - * Newton-Raphson technique, before reconstructing & - * evaluating the RHSs of the MHD equations again. + * "conservative variables", and any time the conserv's + * are updated, we must solve for the primitive variables + * (rho, pressure, velocities) using a Newton-Raphson + * technique, before reconstructing & evaluating the RHSs + * of the MHD equations again. * * This file contains the driver routine for this Newton- * Raphson solver. Truncation errors in conservative - * variables can lead to no solutions in primitive - * variables. We correct for these errors in the code + * variables can lead to no physical solutions in + * primitive variables. We correct for these errors here * through a number of tricks described in the appendices * of http://arxiv.org/pdf/1112.0568.pdf. * File [modified]: driver_evaluate_MHD_rhs.C Delta lines: +1 -1 =================================================================== --- trunk/src/driver_evaluate_MHD_rhs.C 2013-10-07 16:25:07 UTC (rev 8) +++ trunk/src/driver_evaluate_MHD_rhs.C 2013-10-07 16:28:00 UTC (rev 9) @@ -131,7 +131,7 @@ - // 1) First initialize {rho_star_rhs,tau_rhs,st_x_rhs,st_y_rhs,st_z_rhs} to zero + // First initialize {rho_star_rhs,tau_rhs,st_x_rhs,st_y_rhs,st_z_rhs} to zero #pragma omp parallel for for(int k=0;k<cctk_lsh[2];k++) for(int j=0;j<cctk_lsh[1];j++) for(int i=0;i<cctk_lsh[0];i++) { int index=CCTK_GFINDEX3D(cctkGH,i,j,k);

1 0

[svn:einsteintoolkit] IllinoisGRMHD/trunk/src/ (Rev. 8)
by zachetie＠gmail.com 07 Oct '13

07 Oct '13

User: zetienne Date: 2013/10/07 11:25 AM Modified: /trunk/src/ driver_conserv_to_prims.C Log: Add code description & license info in header to Conserv-to-Prims solver File Changes: Directory: /trunk/src/ ====================== File [modified]: driver_conserv_to_prims.C Delta lines: +27 -3 =================================================================== --- trunk/src/driver_conserv_to_prims.C 2013-10-07 15:24:04 UTC (rev 7) +++ trunk/src/driver_conserv_to_prims.C 2013-10-07 16:25:07 UTC (rev 8) @@ -1,6 +1,30 @@ -// Here is a wrapper for the 2d solver described in Noble et al. -// It is meant to be an interface with their code. -// Note that it assumes a simple gamma law for the moment. No hybrid. +/* We evolve forward in time a set of functions called the + * "conservative variables" forward in time, and any time + * the conserv's are updated, we must solve for the + * primitive variables (rho, pressure, velocities) using a + * Newton-Raphson technique, before reconstructing & + * evaluating the RHSs of the MHD equations again. + * + * This file contains the driver routine for this Newton- + * Raphson solver. Truncation errors in conservative + * variables can lead to no solutions in primitive + * variables. We correct for these errors in the code + * through a number of tricks described in the appendices + * of http://arxiv.org/pdf/1112.0568.pdf. + * + * This is a wrapper for the 2d solver of Noble et al. See + * harm_utoprim_2d.c for references and copyright notice + * for that solver. This wrapper was primarily written by + * Zachariah Etienne & Yuk Tung Liu, in 2011-2013. + * + * For optimal compatibility, this wrapper is licensed under + * the GPL v2 or any later version. + * + * Note that this code assumes a simple gamma law for the + * moment, though it would be easy to extend to a piecewise + * polytrope. */ + + #include <iostream> #include <iomanip> #include <fstream>

1 0

[svn:einsteintoolkit] IllinoisGRMHD/trunk/src/ (Rev. 7)
by zachetie＠gmail.com 07 Oct '13

07 Oct '13

User: zetienne Date: 2013/10/07 10:24 AM Removed: /trunk/src/ driver_bcs.F90 Log: Remove dead code. File Changes: Directory: /trunk/src/ ====================== File [removed]: driver_bcs.F90 Delta lines: +0 -74 =================================================================== --- trunk/src/driver_bcs.F90 2013-10-01 23:46:41 UTC (rev 6) +++ trunk/src/driver_bcs.F90 2013-10-07 15:24:04 UTC (rev 7) @@ -1,74 +0,0 @@ -!--------------------------- -! Boundary conditions driver -!--------------------------- - -#include "cctk.h" -#include "cctk_Arguments.h" -#include "cctk_Functions.h" -#include "cctk_Parameters.h" - -subroutine IllinoisGRMHD_driver_bcs(CCTK_ARGUMENTS) - - implicit none - - DECLARE_CCTK_ARGUMENTS - DECLARE_CCTK_PARAMETERS - DECLARE_CCTK_FUNCTIONS - - integer, dimension(3) :: ext,fake_ext,thisproc_have_global_bdry_min,thisproc_have_global_bdry_max,syms - real*8 :: dx,dy,dz - integer :: i - integer :: ierr - integer :: levelnumber - - ext = cctk_lsh - - levelnumber = int( log(real(cctk_levfac(1)))/log(2.0) + 1.e-5 ) + 1 - - dx = CCTK_DELTA_SPACE(1) - dy = CCTK_DELTA_SPACE(2) - dz = CCTK_DELTA_SPACE(3) - - ! FIRST SET SYMMETRY GHOSTZONES ON ALL EVOLVED VARIABLES! - call CartSymGN(ierr,cctkGH,'IllinoisGRMHD::grmhd_conservatives') - syms = (/ 1,0, Sym_Bz /) - call IllinoisGRMHD_set_symmetry_gzs_staggered(cctkGH,cctk_lsh,dx,dy,dz,Symmetry, Ax, syms, 0,1,1) - syms = (/ 0,1, Sym_Bz /) - call IllinoisGRMHD_set_symmetry_gzs_staggered(cctkGH,cctk_lsh,dx,dy,dz,Symmetry, Ay, syms, 1,0,1) - syms = (/ 0,0,-Sym_Bz /) - call IllinoisGRMHD_set_symmetry_gzs_staggered(cctkGH,cctk_lsh,dx,dy,dz,Symmetry, Az, syms, 1,1,0) - - if(levelnumber==1 .and. cctk_iteration.gt.0) then - - ! This is a quick and dirty fix: set thisproc_have_global_bdry_min/max so that - ! ALL boundaries are updated, EXCEPT in symmetry ghostzones! - ! We must apply this fix, since have_global_bdry_min/max does not save all the - ! necessary information when being saved to checkpoint. - ! In other words, have_global_bdry_min/max is BROKEN. - thisproc_have_global_bdry_min=1 - if(Symmetry==1) thisproc_have_global_bdry_min(3)=0 - thisproc_have_global_bdry_max=1 - - !---------------------------------------- - ! Impose frozen BC on the "conservative" variables - ! before primitive recovery - if (Matter_BC==2) then - do i=1,cctk_nghostzones(1) - fake_ext = cctk_lsh - cctk_nghostzones + i - - call apply_matter_frozen_bc(ext,fake_ext, & - rho_star,tau,mhd_st_x,mhd_st_y,mhd_st_z, & - Ax,Ay,Az, & - rho_star_p,tau_p,mhd_st_x_p,mhd_st_y_p,mhd_st_z_p, & - Ax_p,Ay_p,Az_p,thisproc_have_global_bdry_min, & - thisproc_have_global_bdry_max) - end do - else - write(*,*) "ERROR: Matter_BC==",Matter_BC,". Only Matter_BC==2 is supported!" - stop - end if - !---------------------------------------- - - end if - -end subroutine IllinoisGRMHD_driver_bcs

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits October 2013