Some code factoring

[tools/solverlab.git] / CoreFlows / Models / inc / ProblemFluid.hxx

diff --git a/CoreFlows/Models/inc/ProblemFluid.hxx b/CoreFlows/Models/inc/ProblemFluid.hxx
index 9989b61d77c1ccbbf35fe41d7ae2f235c18ee43f..7ed239bd262b0bd771d3cf056030841d293dfd5e 100755 (executable)
--- a/CoreFlows/Models/inc/ProblemFluid.hxx
+++ b/CoreFlows/Models/inc/ProblemFluid.hxx
@@ -30,22 +30,6 @@ enum SpaceScheme
        staggered,/**<  scheme inspired by staggered discretisations */
 };
 
-//! enumeration pressureEstimate
-/*! the pressure estimate needed to fit physical parameters  */
-enum pressureEstimate
-{
-       around1bar300K,/**< pressure is around 1 bar and temperature around 300K (for TransportEquation, SinglePhase and IsothermalTwoFluid) or 373 K (saturation for DriftModel and FiveEqsTwoFluid) */
-       around155bars600K/**< pressure is around 155 bars  and temperature around 618 K (saturation) */
-};
-
-//! enumeration phaseType
-/*! The fluid type can be Gas or water  */
-enum phaseType
-{
-       Liquid,/**< Fluid considered is water */
-       Gas/**< Fluid considered is Gas */
-};
-
 //! enumeration NonLinearFormulation
 /*! the formulation used to compute the non viscous fluxes */
 enum NonLinearFormulation
@@ -56,6 +40,14 @@ enum NonLinearFormulation
        reducedRoe,/**< compacted formulation of Roe scheme without computation of the fluxes */
 };
 
+//! enumeration phaseType
+/*! The material phase can be Gas or liquid  */
+enum phaseType
+{
+       Liquid,/**< Material considered is Liquid */
+       Gas/**< Material considered is Gas */
+};
+
 //! enumeration BoundaryType
 /*! Boundary condition type  */
 enum BoundaryType      {Wall, InnerWall, Inlet, InletPressure, InletRotationVelocity, InletEnthalpy, Outlet, Neumann, NoTypeSpecified};
@@ -362,10 +354,7 @@ public :
         * \brief set the porosity field;
         * @param [in] Field porosity field (field on CELLS)
         * */
-       void setPorosityField(Field Porosity){
-               _porosityField=Porosity;
-               _porosityFieldSet=true;
-       }
+       void setPorosityField(Field Porosity);
 
        /** \fn getPorosityField
         * \brief returns the porosity field;
@@ -382,19 +371,14 @@ public :
         * \param [in] string fieldName
         * \param [out] void
         *  */
-       void setPorosityField(string fileName, string fieldName){
-               _porosityField=Field(fileName, CELLS,fieldName);
-               _porosityFieldSet=true;
-       }
+       void setPorosityField(string fileName, string fieldName);
 
        /** \fn setPressureLossField
         * \brief set the pressure loss coefficients field;
         * @param [in] Field pressure loss field (field on FACES)
         * */
-       void setPressureLossField(Field PressureLoss){
-               _pressureLossField=PressureLoss;
-               _pressureLossFieldSet=true;
-       }
+       void setPressureLossField(Field PressureLoss);
+       
        /** \fn setPressureLossField
         * \brief set the pressure loss coefficient field
         * \details localised friction force
@@ -402,19 +386,14 @@ public :
         * \param [in] string fieldName
         * \param [out] void
         *  */
-       void setPressureLossField(string fileName, string fieldName){
-               _pressureLossField=Field(fileName, FACES,fieldName);
-               _pressureLossFieldSet=true;
-       }
+       void setPressureLossField(string fileName, string fieldName);
 
        /** \fn setSectionField
         * \brief set the cross section field;
         * @param [in] Field cross section field (field on CELLS)
         * */
-       void setSectionField(Field sectionField){
-               _sectionField=sectionField;
-               _sectionFieldSet=true;
-       }
+       void setSectionField(Field sectionField);
+       
        /** \fn setSectionField
         * \brief set the cross section field
         * \details for variable cross section pipe network
@@ -422,10 +401,7 @@ public :
         * \param [in] string fieldName
         * \param [out] void
         *  */
-       void setSectionField(string fileName, string fieldName){
-               _sectionField=Field(fileName, CELLS,fieldName);
-               _sectionFieldSet=true;
-       }
+       void setSectionField(string fileName, string fieldName);
 
        /** \fn setNonLinearFormulation
         * \brief sets the formulation used for the computation of non viscous fluxes
@@ -473,15 +449,16 @@ public :
         *  */
        void setNumericalScheme(SpaceScheme scheme, TimeScheme method=Explicit);
 
-       //données initiales
+       /* ICoCo code coupling interface */
        /*
-       virtual vector<string> getInputFieldsNames()=0 ;//Renvoie les noms des champs dont le problème a besoin (données initiales)
        virtual  Field& getInputFieldTemplate(const string& name)=0;//Renvoie le format de champs attendu (maillage, composantes etc)
-       virtual void setInputField(const string& name, const Field& afield)=0;//enregistre les valeurs d'une donnée initiale
        virtual vector<string> getOutputFieldsNames()=0 ;//liste tous les champs que peut fournir le code pour le postraitement
        virtual Field& getOutputField(const string& nameField )=0;//Renvoie un champs pour le postraitement
         */
-
+       /** Set input fields to prepare the simulation or coupling **/
+       vector<string> getInputFieldsNames();
+       void setInputField(const string& nameField, Field& inputField );//supply of a required input field
+       
        Field getConservativeField() const ;
        Field getPrimitiveField() const;