From: michael <michael@localhost.localdomain>
Date: Wed, 24 Nov 2021 15:19:09 +0000 (+0100)
Subject: More parameters to function setInitialField
X-Git-Tag: V9_8_0~26
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6a280c87d0881fcbce4ee7f6d01169adf69453c1;p=tools%2Fsolverlab.git

More parameters to function setInitialField
---

diff --git a/CoreFlows/Models/inc/ProblemCoreFlows.hxx b/CoreFlows/Models/inc/ProblemCoreFlows.hxx
index 19342ea..68585b8 100755
--- a/CoreFlows/Models/inc/ProblemCoreFlows.hxx
+++ b/CoreFlows/Models/inc/ProblemCoreFlows.hxx
@@ -352,7 +352,7 @@ public :
 	 * \param [in] int : int corresponding to the enum CELLS, NODES or FACES
 	 * \param [out] void
 	 *  */
-	void setInitialField(string fileName, string fieldName, int timeStepNumber, int field_support_type);
+	void setInitialField(string fileName, string fieldName, int timeStepNumber, int order, int meshLevel, int field_support_type);
 
 	/** \fn setInitialField
 	 * \brief sets the initial field from a field in a med file
@@ -363,7 +363,7 @@ public :
 	 * \param [in] EntityType : CELLS, NODES or FACES
 	 * \param [out] void
 	 *  */
-	void setInitialField(string fileName, string fieldName, int timeStepNumber, EntityType typeField = CELLS);
+	void setInitialField(string fileName, string fieldName, int timeStepNumber, int order = 0, int meshLevel=0, EntityType typeField = CELLS);
 
 	/** \fn setInitialFieldConstant
 	 * \brief sets a constant initial field on a mesh stored in a med file
diff --git a/CoreFlows/Models/src/ProblemCoreFlows.cxx b/CoreFlows/Models/src/ProblemCoreFlows.cxx
index b53cb75..5db6bde 100755
--- a/CoreFlows/Models/src/ProblemCoreFlows.cxx
+++ b/CoreFlows/Models/src/ProblemCoreFlows.cxx
@@ -241,7 +241,7 @@ void ProblemCoreFlows::setInitialField(const Field &VV)
 }
 
 //Function needed because swig of enum EntityType fails
-void ProblemCoreFlows::setInitialField(string fileName, string fieldName, int timeStepNumber, int field_support_type)
+void ProblemCoreFlows::setInitialField(string fileName, string fieldName, int timeStepNumber, int order, int meshLevel, int field_support_type)
 {
 	if(_FECalculation && field_support_type!= NODES)
 		cout<<"Warning : finite element simulation should have initial field on nodes!!!"<<endl;
@@ -251,13 +251,13 @@ void ProblemCoreFlows::setInitialField(string fileName, string fieldName, int ti
 	switch(field_support_type)
 	{
 	case CELLS:
-		VV = Field(fileName, CELLS, fieldName, timeStepNumber, 0);
+		VV = Field(fileName, CELLS, fieldName, timeStepNumber, order, meshLevel);
 		break;
 	case NODES:
-		VV = Field(fileName, NODES, fieldName, timeStepNumber, 0);
+		VV = Field(fileName, NODES, fieldName, timeStepNumber, order, meshLevel);
 		break;
 	case FACES:
-		VV = Field(fileName, FACES, fieldName, timeStepNumber, 0);
+		VV = Field(fileName, FACES, fieldName, timeStepNumber, order, meshLevel);
 		break;
 	default:
 		std::ostringstream message;
@@ -296,12 +296,12 @@ void ProblemCoreFlows::setInitialFieldConstant( int nDim, const vector<double> V
 	
 	setInitialFieldConstant( nDim, Vconstant, xmin, xmax, nx, leftSide, rightSide, ymin, ymax, ny, backSide, frontSide, zmin, zmax, nz, bottomSide, topSide, typeField);
 }
-void ProblemCoreFlows::setInitialField(string fileName, string fieldName, int timeStepNumber, EntityType typeField)
+void ProblemCoreFlows::setInitialField(string fileName, string fieldName, int timeStepNumber, int order, int meshLevel, EntityType typeField)
 {
 	if(_FECalculation && typeField!= NODES)
 		cout<<"Warning : finite element simulation should have initial field on nodes!!!"<<endl;
 
-	Field VV(fileName, typeField, fieldName, timeStepNumber, 0);
+	Field VV(fileName, typeField, fieldName, timeStepNumber, order, meshLevel);
 	
 	setInitialField(VV);
 }