fix med_int conversion

This commit is contained in:
azakir 2020-12-12 16:35:18 +01:00
parent c0c883fc72
commit af459b337c
2 changed files with 7 additions and 7 deletions

View File

@ -429,8 +429,8 @@ bool MgAdapt::setAll()
} }
setSizeMapFile(mapfile); setSizeMapFile(mapfile);
int rank; med_int rank;
int tmst; med_int tmst;
if (data->myUseNoTimeStep) if (data->myUseNoTimeStep)
{ {
rank = MED_NO_IT; rank = MED_NO_IT;
@ -446,7 +446,7 @@ bool MgAdapt::setAll()
rank = data->myRank; rank = data->myRank;
tmst = data->myTimeStep; tmst = data->myTimeStep;
} }
setRankTimeStep(tmst, rank); setRankTimeStep((int)tmst, (int)rank);
/* Advanced options */ /* Advanced options */
setWorkingDir(data->myWorkingDir); setWorkingDir(data->myWorkingDir);
@ -1233,13 +1233,13 @@ MgAdapt::Status MgAdapt::addMessage(const std::string& msg,
// ======================================================================= // =======================================================================
void MgAdapt::getTimeStepInfos(std::string aFile, int& numdt, int& numit) void MgAdapt::getTimeStepInfos(std::string aFile, med_int& numdt, med_int& numit)
// ======================================================================= // =======================================================================
{ {
// Il faut voir si plusieurs maillages // Il faut voir si plusieurs maillages
med_err erreur = 0 ; herr_t erreur = 0 ;
med_idt medIdt ; med_idt medIdt ;
@ -1278,7 +1278,7 @@ void MgAdapt::getTimeStepInfos(std::string aFile, int& numdt, int& numit)
} }
med_float dt; med_float dt;
int tmp_numdt, tmp_numit; med_int tmp_numdt, tmp_numit;
med_int step = data->myUseLastTimeStep ? nbofcstp : data->myTimeStep+1; med_int step = data->myUseLastTimeStep ? nbofcstp : data->myTimeStep+1;
//~myPrint("step ", step); //~myPrint("step ", step);

View File

@ -318,7 +318,7 @@ private :
void storeGroupsAndFams(MEDCoupling::MEDFileMesh* fileMesh); void storeGroupsAndFams(MEDCoupling::MEDFileMesh* fileMesh);
void restoreGroupsAndFams(MEDCoupling::MEDFileMesh* fileMesh) const; void restoreGroupsAndFams(MEDCoupling::MEDFileMesh* fileMesh) const;
void convertMeshFile(std::string& meshFormatIn, std::vector< std::string>& solFieldFileNames) const ; void convertMeshFile(std::string& meshFormatIn, std::vector< std::string>& solFieldFileNames) const ;
void getTimeStepInfos(std::string aFile, int& numdt, int& numit); void getTimeStepInfos(std::string aFile, med_int& numdt, med_int& numit);
Status addMessage(const std::string& msg, const bool isFatal = false); Status addMessage(const std::string& msg, const bool isFatal = false);
med_idt openMedFile(const std::string aFile) ; med_idt openMedFile(const std::string aFile) ;
bool isFileExist(std::string& fName) const; bool isFileExist(std::string& fName) const;