Check mesh equivalence when setting input fields

diff --git a/CoreFlows/Models/inc/DiffusionEquation.hxx b/CoreFlows/Models/inc/DiffusionEquation.hxx
index 001f23c7fc24ebc59c1553de18835ef52cc038c1..ec2692c3d4207dc13fa152afcbbac21284be77c1 100755 (executable)
--- a/CoreFlows/Models/inc/DiffusionEquation.hxx
+++ b/CoreFlows/Models/inc/DiffusionEquation.hxx
@@ -107,6 +107,7 @@ public :
        void setInputField(const string& nameField, Field& inputField );//supply of a required input field
 
        void setFluidTemperatureField(Field coupledTemperatureField){
+               coupledTemperatureField.getMesh().checkFastEquivalWith(_mesh);
                _fluidTemperatureField=coupledTemperatureField;
                _fluidTemperatureFieldSet=true;
        };

diff --git a/CoreFlows/Models/inc/ProblemCoreFlows.hxx b/CoreFlows/Models/inc/ProblemCoreFlows.hxx
index 6ec3c6067bea8d6058ec9d93c340618b5fe8aa1d..19342ea8e57414d38735e9e5f22b73e362117899 100755 (executable)
--- a/CoreFlows/Models/inc/ProblemCoreFlows.hxx
+++ b/CoreFlows/Models/inc/ProblemCoreFlows.hxx
@@ -666,6 +666,7 @@ public :
         * \param [out] void
         *  */
        void setHeatPowerField(Field heatPower){
+               heatPower.getMesh().checkFastEquivalWith(_mesh);
                _heatPowerField=heatPower;
                _heatPowerFieldSet=true;
                _isStationary=false;//Source term may be changed after previously reaching a stationary state
@@ -678,8 +679,9 @@ public :
         * \param [in] string fieldName
         * \param [out] void
         *  */
-       void setHeatPowerField(string fileName, string fieldName){
-               _heatPowerField=Field(fileName, CELLS,fieldName);
+       void setHeatPowerField(string fileName, string fieldName, int iteration = 0, int order = 0, int meshLevel=0){
+               _heatPowerField=Field(fileName, CELLS,fieldName, iteration, order, meshLevel);
+               _heatPowerField.getMesh().checkFastEquivalWith(_mesh);
                _heatPowerFieldSet=true;
                _isStationary=false;//Source term may be changed after previously reaching a stationary state
        }

diff --git a/CoreFlows/Models/inc/ProblemFluid.hxx b/CoreFlows/Models/inc/ProblemFluid.hxx
index 0858618752e8cc18392ce0a671de488562e4b1fa..79f1a8f0113534561f99606ddb1fbe3f7ae10891 100755 (executable)
--- a/CoreFlows/Models/inc/ProblemFluid.hxx
+++ b/CoreFlows/Models/inc/ProblemFluid.hxx
@@ -363,6 +363,7 @@ public :
         * @param [in] Field porosity field (field on CELLS)
         * */
        void setPorosityField(Field Porosity){
+               Porosity.getMesh().checkFastEquivalWith(_mesh);
                _porosityField=Porosity;
                _porosityFieldSet=true;
        }
@@ -384,6 +385,7 @@ public :
         *  */
        void setPorosityField(string fileName, string fieldName){
                _porosityField=Field(fileName, CELLS,fieldName);
+               _porosityField.getMesh().checkFastEquivalWith(_mesh);
                _porosityFieldSet=true;
        }
 
@@ -392,6 +394,7 @@ public :
         * @param [in] Field pressure loss field (field on FACES)
         * */
        void setPressureLossField(Field PressureLoss){
+               PressureLoss.getMesh().checkFastEquivalWith(_mesh);
                _pressureLossField=PressureLoss;
                _pressureLossFieldSet=true;
        }
@@ -404,6 +407,7 @@ public :
         *  */
        void setPressureLossField(string fileName, string fieldName){
                _pressureLossField=Field(fileName, FACES,fieldName);
+               _pressureLossField.getMesh().checkFastEquivalWith(_mesh);
                _pressureLossFieldSet=true;
        }
 
@@ -412,6 +416,7 @@ public :
         * @param [in] Field cross section field (field on CELLS)
         * */
        void setSectionField(Field sectionField){
+               sectionField.getMesh().checkFastEquivalWith(_mesh);
                _sectionField=sectionField;
                _sectionFieldSet=true;
        }
@@ -424,6 +429,7 @@ public :
         *  */
        void setSectionField(string fileName, string fieldName){
                _sectionField=Field(fileName, CELLS,fieldName);
+               _sectionField.getMesh().checkFastEquivalWith(_mesh);
                _sectionFieldSet=true;
        }
 

diff --git a/CoreFlows/Models/inc/StationaryDiffusionEquation.hxx b/CoreFlows/Models/inc/StationaryDiffusionEquation.hxx
index b47aa6b5f0b414af846958b48aec66147d6e982c..008afe4fb33c30c648b0a903f79074cd1f949722 100755 (executable)
--- a/CoreFlows/Models/inc/StationaryDiffusionEquation.hxx
+++ b/CoreFlows/Models/inc/StationaryDiffusionEquation.hxx
@@ -131,6 +131,7 @@ public :
         * \param [out] void
         *  */
        void setHeatPowerField(Field heatPower){
+               heatPower.getMesh().checkFastEquivalWith(_mesh);
                _heatPowerField=heatPower;
                _heatPowerFieldSet=true;
        }
@@ -142,8 +143,9 @@ public :
         * \param [in] string fieldName
         * \param [out] void
         *  */
-       void setHeatPowerField(string fileName, string fieldName){
-               _heatPowerField=Field(fileName, CELLS,fieldName);
+       void setHeatPowerField(string fileName, string fieldName, int iteration = 0, int order = 0, int meshLevel=0){
+               _heatPowerField=Field(fileName, CELLS,fieldName, iteration, order, meshLevel);
+               _heatPowerField.getMesh().checkFastEquivalWith(_mesh);
                _heatPowerFieldSet=true;
        }
 

diff --git a/CoreFlows/Models/inc/TransportEquation.hxx b/CoreFlows/Models/inc/TransportEquation.hxx
index 94f01c0d23d0b4878548c621fc79c2892f6f6ac0..e1f2b9a7544ea718c3a6f7c2b82318230bb9d406 100755 (executable)
--- a/CoreFlows/Models/inc/TransportEquation.hxx
+++ b/CoreFlows/Models/inc/TransportEquation.hxx
@@ -137,6 +137,7 @@ public :
         * \param [out] void
         *  */
        void setRodTemperatureField(Field rodTemperature){
+               rodTemperature.getMesh().checkFastEquivalWith(_mesh);
                _rodTemperatureField=rodTemperature;
                _rodTemperatureFieldSet=true;
                _isStationary=false;//Source term may be changed after previously reaching a stationary state