Commit 9048e1f1 authored by Tilman Steinweg's avatar Tilman Steinweg
Browse files

Merge branch 'develop'

parents bd64867e 15d11566
......@@ -85,9 +85,9 @@ namespace KITGPI
void applyThresholds(Configuration::Configuration const &config) override;
void minusAssign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs);
void plusAssign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs);
void assign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs);
void minusAssign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs) override;
void plusAssign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs) override;
void assign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs) override;
/* Overloading Operators */
KITGPI::Modelparameter::Acoustic<ValueType> operator*(ValueType rhs);
......
......@@ -76,9 +76,9 @@ namespace KITGPI
void applyThresholds(Configuration::Configuration const &config) override;
void minusAssign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs);
void plusAssign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs);
void assign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs);
void minusAssign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs) override;
void plusAssign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs) override;
void assign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs) override;
/* Overloading Operators */
KITGPI::Modelparameter::Elastic<ValueType> operator*(ValueType rhs);
......
......@@ -229,6 +229,16 @@ scai::lama::Vector<ValueType> const &KITGPI::Modelparameter::SH<ValueType>::getV
return (velocityP);
}
/*! \brief Get reference to tauP
*
*/
template <typename ValueType>
scai::lama::Vector<ValueType> const &KITGPI::Modelparameter::SH<ValueType>::getPWaveModulus()
{
COMMON_THROWEXCEPTION("There is no pWaveModulus parameter in an sh modelling")
return (pWaveModulus);
}
/*! \brief Get reference to tauP
*
*/
......@@ -283,6 +293,15 @@ scai::lama::Vector<ValueType> const &KITGPI::Modelparameter::SH<ValueType>::getT
return (tauSAverageXY);
}
/*! \brief Get reference to tauS xy-plane
*/
template <typename ValueType>
scai::lama::Vector<ValueType> const &KITGPI::Modelparameter::SH<ValueType>::getTauSAverageXY() const
{
COMMON_THROWEXCEPTION("There is no averaged tau parameter in an sh modelling")
return (tauSAverageXY);
}
/*! \brief Get reference to tauS xz-plane
*/
template <typename ValueType>
......@@ -292,6 +311,15 @@ scai::lama::Vector<ValueType> const &KITGPI::Modelparameter::SH<ValueType>::getT
return (tauSAverageXZ);
}
/*! \brief Get reference to tauS xz-plane
*/
template <typename ValueType>
scai::lama::Vector<ValueType> const &KITGPI::Modelparameter::SH<ValueType>::getTauSAverageXZ() const
{
COMMON_THROWEXCEPTION("There is no averaged tau parameter in an sh modelling")
return (tauSAverageXZ);
}
/*! \brief Get reference to tauS yz-plane
*/
template <typename ValueType>
......@@ -301,6 +329,14 @@ scai::lama::Vector<ValueType> const &KITGPI::Modelparameter::SH<ValueType>::getT
return (tauSAverageYZ);
}
/*! \brief Get reference to tauS yz-plane
*/
template <typename ValueType>
scai::lama::Vector<ValueType> const &KITGPI::Modelparameter::SH<ValueType>::getTauSAverageYZ() const
{
COMMON_THROWEXCEPTION("There is no averaged tau parameter in an sh modelling")
return (tauSAverageYZ);
}
/*! \brief Overloading * Operation
*
\param rhs ValueType factor with which the vectors are multiplied.
......
......@@ -63,12 +63,17 @@ namespace KITGPI
/* Getter methods for not requiered parameters */
scai::lama::Vector<ValueType> const &getVelocityP() const override;
scai::lama::Vector<ValueType> const &getPWaveModulus() override;
scai::lama::Vector<ValueType> const &getPWaveModulus() const override;
scai::lama::Vector<ValueType> const &getTauP() const override;
scai::lama::Vector<ValueType> const &getTauS() const override;
scai::lama::Vector<ValueType> const &getTauSAverageXY() override;
scai::lama::Vector<ValueType> const &getTauSAverageXY() const override;
scai::lama::Vector<ValueType> const &getTauSAverageXZ() override;
scai::lama::Vector<ValueType> const &getTauSAverageXZ() const override;
scai::lama::Vector<ValueType> const &getTauSAverageYZ() override;
scai::lama::Vector<ValueType> const &getTauSAverageYZ() const override;
scai::IndexType getNumRelaxationMechanisms() const override;
ValueType getRelaxationFrequency() const override;
......@@ -76,9 +81,9 @@ namespace KITGPI
void applyThresholds(Configuration::Configuration const &config) override;
void minusAssign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs);
void plusAssign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs);
void assign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs);
void minusAssign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs) override;
void plusAssign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs) override;
void assign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs) override;
/* Overloading Operators */
KITGPI::Modelparameter::SH<ValueType> operator*(ValueType rhs);
......
......@@ -325,6 +325,17 @@ scai::lama::Vector<ValueType> const &KITGPI::Modelparameter::Viscoelastic<ValueT
return (pWaveModulus);
}
/*! \brief Get const reference to P-wave modulus (viscoelastic case)
*
* if P-Wave Modulus is dirty (eg. because of changes in velocityP, the P-Wave modulus will be recalculated
*/
template <typename ValueType>
scai::lama::Vector<ValueType> const &KITGPI::Modelparameter::Viscoelastic<ValueType>::getPWaveModulus() const
{
SCAI_ASSERT(dirtyFlagPWaveModulus == false, "P-Wave Modulus has to be recalculated! ");
return (pWaveModulus);
}
/*! \brief Get const reference to S-wave modulus (viscoelastic case)
*
* if S-Wave Modulus is dirty (eg. because of changes in velocityS, the S-Wave modulus will be recalculated
......@@ -348,7 +359,18 @@ scai::lama::Vector<ValueType> const &KITGPI::Modelparameter::Viscoelastic<ValueT
dirtyFlagSWaveModulus = false;
}
return (pWaveModulus);
return (sWaveModulus);
}
/*! \brief Get const reference to S-wave modulus (viscoelastic case) const
*
* if S-Wave Modulus is dirty (eg. because of changes in velocityS it ca
*/
template <typename ValueType>
scai::lama::Vector<ValueType> const &KITGPI::Modelparameter::Viscoelastic<ValueType>::getSWaveModulus() const
{
SCAI_ASSERT(dirtyFlagSWaveModulus == false, "P-Wave Modulus has to be recalculated! ");
return (sWaveModulus);
}
/*! \brief Overloading * Operation
......
......@@ -63,15 +63,17 @@ namespace KITGPI
std::string getEquationType() const;
scai::lama::Vector<ValueType> const &getPWaveModulus() override;
scai::lama::Vector<ValueType> const &getPWaveModulus() const override;
scai::lama::Vector<ValueType> const &getSWaveModulus() override;
scai::lama::Vector<ValueType> const &getSWaveModulus() const override;
void prepareForModelling(Acquisition::Coordinates<ValueType> const &modelCoordinates, scai::hmemo::ContextPtr ctx, scai::dmemo::DistributionPtr dist, scai::dmemo::CommunicatorPtr comm) override;
void applyThresholds(Configuration::Configuration const &config) override;
void minusAssign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs);
void plusAssign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs);
void assign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs);
void minusAssign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs) override;
void plusAssign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs) override;
void assign(KITGPI::Modelparameter::Modelparameter<ValueType> const &rhs) override;
/* Overloading Operators */
KITGPI::Modelparameter::Viscoelastic<ValueType> operator*(ValueType rhs);
......
Supports Markdown
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