Commit 677e1ca8 by Anne Reinarz

### remove tensish

parent 6885665f
 ... ... @@ -10,10 +10,6 @@ namespace idx = FOCCZ4::FOCCZ4Solver_ADERDG_Variables::shortcuts; constexpr int nVar = FOCCZ4::AbstractFOCCZ4Solver_ADERDG::NumberOfVariables; constexpr int order = FOCCZ4::AbstractFOCCZ4Solver_ADERDG::Order; #define TDIM DIMENSIONS #include "SVEC/tensish.cpph" // We use tensish for simplicity //#include "InitialData/ADMBase.h" // We use ADMBase for nonconformal computation #include #include #include ... ... @@ -28,22 +24,19 @@ ADMIntegralsSimple::Sphere::Sphere(double radius, int ntheta, int nphi) : } void ADMIntegralsSimple::Sphere::reset() { TDO(i, sphereDim) measured_points[i] = 0; TDO(i, numIntegrands) I[i] = 0; for(int i=0; i< sphereDim; i++) measured_points[i] = 0; for(int i=0; i; // instead of using dvec = tarch::la::Vector; // helpers: inline array3 cartesian(const double R, const double theta, const double phi) { array3 pos; pos[0] = R * sin(theta) * cos(phi); ... ... @@ -58,13 +51,6 @@ namespace SphericalCoordinates { ///< to avoid magic numbers constexpr int phi = 2; } #define eps tensish::sym::levi // epsilon function alias // These are stolen from ADMBase.cpp using metric_t = tensish::metric::generic; using auxGamma_t = tensish::generic::stored, DIMENSIONS>; void ADMIntegralsSimple::Sphere::Integrand(const double* const xpos, const double* const dxpos, const double* const Q, double* I) { using namespace SphericalCoordinates; ... ... @@ -213,11 +199,9 @@ void ADMIntegralsSimple::Sphere::plotPatch(const double* const offsetOfPatch, assert(DIMENSIONS == 3); assertTimes(timeStamp); // This code comes from the GRMHD/Writers/SphereIntegrals.cpp, a dumb an inefficient // way to sample the 2d sphere with a uniform rectangular grid with ntheta x nphi points // and a loop which just checks for each one whether it is contained in the current patch or not. const double dx[3] = { /* dr */ 0, /* dtheta */ pi/num_points[0], /* dphi */ 2*pi/num_points[1] }; const double dx[3] = { /* dr */ 0, /* dtheta */ pi/num_points[0], /* dphi */ 2*pi/num_points[1] }; int ind[3]; // running indices for rho (not used), theta, phi array3 pos; // integration point ... ... @@ -228,14 +212,15 @@ void ADMIntegralsSimple::Sphere::plotPatch(const double* const offsetOfPatch, // check if it is inside the current cell bool isinside = true; DFOR(d) for(int d=0; d
 tensish.cpph ist ein Softlink <-[mit]-> GRMHD's SVEC tensish Grund: kann dort dann einfacher gepusht werden
This diff is collapsed.
 #!/bin/bash # # This is a small script to copy the SVEC source code to the local application. # We actually manage the SVEC code at https://bitbucket.org/svek/svec # and want to keep the code there. ExaHyPE lacks a proper way of managing external # repos... # SvenK, 2018-07-17 SVEC="../../../ExternalLibraries/SVEC" [[ -e \$SVEC ]] || { echo "Cannot find \$SVEC"; exit -1; } svec="\$SVEC/svec" [[ -e \$svec ]] || \$SVEC/download-SVEC.sh || { echo "Cannot download SVEC"; exit -1; } for remotef in \$svec/src/PDE/tensish.cpph; do localf=\$(basename \$remotef) if [[ -e \$localf ]] && ! diff \$localf \$remotef ; then echo "\$localf has local changes, compared to \$remotef , please merge back!" exit -1 else cp -v \$remotef \$localf fi done echo "Done"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!