ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-14 09:38:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

little corrections

Browse Source
This commit is contained in:
azakir 2021-01-15 12:03:28 +01:00
parent 43e6429c58
commit 4cd6311d74
4 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
idl/MG_ADAPT.idl
View File

@ -71,13 +71,13 @@ module SMESH{
void setPublish(in boolean b); void setPublish(in boolean b);
boolean getPublish(); boolean getPublish();
void setFieldName(in string s); void setSizeMapFieldName(in string s);
string getFieldName(); string getSizeMapFieldName();
void setTimeStep(in long s); void setTimeStep(in long s);
long getTimeStep() ; long getTimeStep() ;
void setRankTimeStep(in long s, in long f); void setTimeStepRank(in long s, in long f);
long getRank(); long getRank();
void setTimeStepRankLast(); void setTimeStepRankLast();
@ -103,8 +103,8 @@ module SMESH{
void setUseConstantValue(in boolean f); void setUseConstantValue(in boolean f);
boolean getUseConstantValue(); boolean getUseConstantValue();
void setConstantValue(in double f); void setConstantSize(in double f);
double getConstantValue() ; double getConstantSize() ;
void setSizeMapFile(in string f); void setSizeMapFile(in string f);
string getSizeMapFile(); string getSizeMapFile();
@ -121,7 +121,7 @@ module SMESH{
void setWorkingDir(in string f); void setWorkingDir(in string f);
string getWorkingDir() ; string getWorkingDir() ;
void setSizeMapType(in string f);
boolean setAll(); boolean setAll();
string getCommandToRun() ; string getCommandToRun() ;
//long compute(out string errStr); //long compute(out string errStr);
@ -143,7 +143,16 @@ module SMESH{
str_array getCustomOptionValuesStrVec() ; str_array getCustomOptionValuesStrVec() ;
str_array getOptionValuesStrVec() ; str_array getOptionValuesStrVec() ;
}; };
typedef MG_ADAPT MG_ADAPT_HYPOTHESIS;
interface MG_ADAPT_OBJECT : SALOME::GenericObj
{
void setMeshIn(in SMESH_Mesh theMesh );
void setMEDFileIn(in string f);
void setMEDFileOut(in string f);
void setMEDFileBackground(in string f);
void AddHypothesis(in MG_ADAPT mg);
long Compute(in boolean Publish);
};
}; };
#endif // MG_ADAPT_IDL #endif // MG_ADAPT_IDL

3
idl/SMESH_Gen.idl
View File

@ -44,6 +44,7 @@ module SMESH
interface SMESH_Pattern; interface SMESH_Pattern;
interface Measurements; interface Measurements;
interface MG_ADAPT; interface MG_ADAPT;
interface MG_ADAPT_OBJECT;
/*! /*!
* Tags definition * Tags definition
@ -586,6 +587,8 @@ module SMESH
MG_ADAPT CreateMG_ADAPT(); MG_ADAPT CreateMG_ADAPT();
MG_ADAPT_OBJECT Adaptation(in string adaptType);
MG_ADAPT CreateAdaptationHypothesis();
}; };
}; };

9
src/SMESH/MG_ADAPT.cxx
View File

@ -1426,17 +1426,18 @@ void MgAdapt::getTimeStepInfos(std::string aFile, med_int& numdt, med_int& numit
void MgAdapt::updateTimeStepRank() void MgAdapt::updateTimeStepRank()
{ {
med_int arank = rank; med_int arank;
med_int tmst = timeStep; med_int tmst;
if (myUseNoTimeStep) if (myUseNoTimeStep)
{ {
rank = MED_NO_IT; arank = MED_NO_IT;
tmst = MED_NO_DT ; tmst = MED_NO_DT ;
setRankTimeStep((int)tmst, (int)arank);
} }
else if (myUseLastTimeStep) else if (myUseLastTimeStep)
{ {
std::string fieldFile = useBackgroundMap ? sizeMapFile : medFileIn; std::string fieldFile = useBackgroundMap ? sizeMapFile : medFileIn;
getTimeStepInfos(fieldFile, tmst, arank); getTimeStepInfos(fieldFile, tmst, arank);
}
setRankTimeStep((int)tmst, (int)arank); setRankTimeStep((int)tmst, (int)arank);
} }
}

1
src/SMESH_I/MG_ADAPT_i.cxx
View File

@ -246,6 +246,7 @@ CORBA::Long MG_ADAPT_i::getTimeStep()
} }
void MG_ADAPT_i::setTimeStepRank(CORBA::Long t, CORBA::Long r) void MG_ADAPT_i::setTimeStepRank(CORBA::Long t, CORBA::Long r)
{ {
myMgAdapt->setChosenTimeStepRank();
myMgAdapt->setRankTimeStep(t, r); myMgAdapt->setRankTimeStep(t, r);
} }
CORBA::Long MG_ADAPT_i::getRank() CORBA::Long MG_ADAPT_i::getRank()