Commit 596994ca authored by Steffen Schotthöfer's avatar Steffen Schotthöfer
Browse files

repaired some post merge errors. Updated readme


Former-commit-id: 50bef8d8
parent 66466fe1
......@@ -164,6 +164,8 @@ Please stick to the following coding style for easier code readability:
- class variables start with an underscore and lowercase letters e.g. `_foo`
- functions start with a capital letter e.g. `GetSettings()`
- any variable/function names have capital letters at each individual word e.g. `GetAllCellsAdjacentTo(Cell i)`
- Abstract base classes for inheritance structures end with the suffix "Base" e.g. QuadratureBase, whith child classes
QGaussLegendre or QProduct
Please also use the provided `code/.clang-format` style format to format your code before pushing your latest commits.
Some editors offer to automatically apply the style format upon saving a file (e.g. `Qtcreator`).
......@@ -12,9 +12,10 @@
#define SPHERICALHARMONICS_H
#include "common/typedef.h"
#include "toolboxes/sphericalbasisbase.h"
#include <vector>
class SphericalHarmonics
class SphericalHarmonics : public SphericalBasisBase
{
public:
/*! @brief : Sets up class for spherical harmonics basis based on legendre
......@@ -30,13 +31,13 @@ class SphericalHarmonics
* @param : phi - spherical coordinate, 0 <= phi <= 2*pi
* @return : vector of basis functions at point (my, phi) with size N = L² +2L
*/
Vector ComputeSphericalBasis( double my, double phi );
Vector ComputeSphericalBasis( double my, double phi ) override;
/*! @brief : Computes all N = L² +2L basis functions at point (x, y, z) on the unit sphere
* @param : x,y,z = coordinates on unit sphere
* @return : vector of basis functions at point (x,y,z) with size N = L² +2L
*/
Vector ComputeSphericalBasis( double x, double y, double z );
Vector ComputeSphericalBasis( double x, double y, double z ) override;
/*! @brief : helper function to get the global index for given k and l of
* the basis function Y_k^l.
......
......@@ -9,7 +9,7 @@
#include "entropies/entropybase.h"
#include "optimizers/newtonoptimizer.h"
#include "quadratures/quadraturebase.h"
#include "solvers/sphericalharmonics.h"
#include "toolboxes/sphericalharmonics.h"
#include "spdlog/spdlog.h"
......@@ -23,7 +23,7 @@ nnDataGenerator::nnDataGenerator( Config* settings ) {
_nTotalEntries = (unsigned)GlobalIndex( _LMaxDegree, _LMaxDegree ) + 1;
// Quadrature
_quadrature = QuadratureBase::CreateQuadrature( settings );
_quadrature = QuadratureBase::Create( settings );
_nq = _quadrature->GetNq();
_quadPoints = _quadrature->GetPoints();
_weights = _quadrature->GetWeights();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment