Corrected error. function getTime was not defined in class TransportEquation

diff --git a/CoreFlows/Models/inc/ProblemCoreFlows.hxx b/CoreFlows/Models/inc/ProblemCoreFlows.hxx
index 2756110af51311175f42f741f69a1a805a9d8fd2..c66322caac84ac6d1ea046b34038ff0a0b510b83 100755 (executable)
--- a/CoreFlows/Models/inc/ProblemCoreFlows.hxx
+++ b/CoreFlows/Models/inc/ProblemCoreFlows.hxx
@@ -77,8 +77,8 @@ public :
        //! Constructeur par défaut
        ProblemCoreFlows();
        virtual ~ProblemCoreFlows();
-       // -*-*-*- Gestion du calcul -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
-
+       
+       // -*-*-*- Gestion du calcul (interface ICoCo -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
 
        /** \fn initialize
         * \brief Alloue la mémoire et vérifie que  le maillage et les conditions limites/initiales sont bien définis
@@ -182,6 +182,8 @@ public :
        virtual Field& getOutputField(const string& nameField )=0;//Renvoie un champs pour le postraitement
         */
 
+       Field getUnknownField() const;
+       
        //paramètres du calcul -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
 
        /** \fn setPresentTime

diff --git a/CoreFlows/Models/inc/ProblemFluid.hxx b/CoreFlows/Models/inc/ProblemFluid.hxx
index 3f8fea88e1ac1642c9fa17f3455b9502f38bef8b..00e92cae6cb68b02be282914224f20cf2c2b44b0 100755 (executable)
--- a/CoreFlows/Models/inc/ProblemFluid.hxx
+++ b/CoreFlows/Models/inc/ProblemFluid.hxx
@@ -240,7 +240,7 @@ public :
         * @param void
         * @return the number of phases considered in the model
         * */
-       int getNumberOfPhases(){
+       int getNumberOfPhases() const {
                return _nbPhases;
        };
 
@@ -327,7 +327,7 @@ public :
         * \brief returns the value of the latent heat
         * @param double L, the value of the latent heat
         * */
-       double getLatentHeat(){
+       double getLatentHeat() const{
                return _latentHeat;
        }
 
@@ -343,7 +343,7 @@ public :
         * \brief sets the saturation temperature
         * @param  Tsat double corresponds to saturation temperature
         * */
-       double getSatTemp(){
+       double getSatTemp() const {
                return _Tsat;
        }
 
@@ -369,7 +369,7 @@ public :
         * \brief returns the porosity field;
         * @param
         * */
-       Field getPorosityField(){
+       Field getPorosityField() const {
                return _porosityField;
        }
 
@@ -443,7 +443,7 @@ public :
         * \param [in] void
         * \param [out] enum NonLinearFormulation
         *  */
-       NonLinearFormulation getNonLinearFormulation(){
+       NonLinearFormulation getNonLinearFormulation() const{
                return _nonLinearFormulation;
        }
 
@@ -460,7 +460,7 @@ public :
         * \param [in] void
         * \param [out] enum SpaceScheme(upwind, centred, pressureCorrection, pressureCorrection, staggered)
         *  */
-       SpaceScheme getSpaceScheme();
+       SpaceScheme getSpaceScheme() const;
 
        /** \fn setNumericalScheme
         * \brief sets the numerical method (upwind vs centered and explicit vs implicit)
@@ -480,6 +480,9 @@ public :
        virtual Field& getOutputField(const string& nameField )=0;//Renvoie un champs pour le postraitement
         */
 
+       Field getConservativeField() const ;
+       Field getPrimitiveField() const;
+
 protected :
        /** Number of phases in the fluid **/
        int _nbPhases;

diff --git a/CoreFlows/Models/inc/TransportEquation.hxx b/CoreFlows/Models/inc/TransportEquation.hxx
index ec6361d4420227a6719cfc5d59a4d48e92e63708..5acc4ed90766a857c7a6df0c948557e4d82593c1 100755 (executable)
--- a/CoreFlows/Models/inc/TransportEquation.hxx
+++ b/CoreFlows/Models/inc/TransportEquation.hxx
@@ -138,13 +138,6 @@ public :
                return _VV;
        }
 
-       /** \fn getTimeScheme
-        * \brief returns the  time scheme name
-        * \param [in] void
-        * \param [out] enum TimeScheme (explicit or implicit)
-        *  */
-       TimeScheme getTimeScheme();
-
 protected :
        double computeTransportMatrix();
        double computeRHS();

diff --git a/CoreFlows/Models/src/ProblemCoreFlows.cxx b/CoreFlows/Models/src/ProblemCoreFlows.cxx
index 916f6076daf375cc229f262356f79fe82a594633..11f7e25767c84d42cf951f6f03ad000c732c192b 100755 (executable)
--- a/CoreFlows/Models/src/ProblemCoreFlows.cxx
+++ b/CoreFlows/Models/src/ProblemCoreFlows.cxx
@@ -621,3 +621,14 @@ ProblemCoreFlows::getEigenvectorsField(int nev, EPSWhich which, double tol) cons
   
   return my_eigenfield;
 }
+
+Field 
+ProblemCoreFlows::getUnknownField() const
+{
+       if(!_initializedMemory)
+       {
+               _runLogFile->close();
+               throw CdmathException("ProblemCoreFlows::getUnknownField() call initialize() first");
+       }
+       return _VV;
+}

diff --git a/CoreFlows/Models/src/ProblemFluid.cxx b/CoreFlows/Models/src/ProblemFluid.cxx
index 61417668098a3ce1dedef3a9b2308e92074a1211..e1793de7a28fb44be337f084d5819e789bc96b1a 100755 (executable)
--- a/CoreFlows/Models/src/ProblemFluid.cxx
+++ b/CoreFlows/Models/src/ProblemFluid.cxx
@@ -29,7 +29,7 @@ ProblemFluid::ProblemFluid(void){
        _spaceScheme=upwind;
 }
 
-SpaceScheme ProblemFluid::getSpaceScheme()
+SpaceScheme ProblemFluid::getSpaceScheme() const
 {
        return _spaceScheme;
 }
@@ -1429,6 +1429,26 @@ void ProblemFluid::InvMatriceRoe(vector< complex<double> > valeurs_propres_dist)
        }
 }
 
+Field ProblemFluid::getConservativeField() const
+{
+       if(!_initializedMemory)
+       {
+               _runLogFile->close();
+               throw CdmathException("ProblemFluid::getConservativeField call initialize() first");
+       }
+       return _UU;
+}
+
+Field ProblemFluid::getPrimitiveField() const
+{
+       if(!_initializedMemory)
+       {
+               _runLogFile->close();
+               throw CdmathException("ProblemFluid::getPrimitiveField call initialize() first");
+       }
+       return _VV;
+}
+
 void ProblemFluid::terminate(){
 
        delete[] _AroePlus;