From d00ffaecd6f3de9f4cdbf9207c5247287ed7f254 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 1 Dec 2004 10:44:43 +0000 Subject: [PATCH] Merge with version on tag OCC-V2_1_0d --- INSTALL | 4 +- bin/VERSION | 2 +- doc/salome/tui/MED/HTML/MED.html | 88 +++++++++++++++++++++-- doc/salome/tui/MED/doxyfile | 2 +- doc/salome/tui/MED/sources/static/tree.js | 2 +- resources/MEDCatalog.xml | 2 +- src/MED/Med_Gen_i.cxx | 74 ++++++++++--------- src/MEDMEM_I/MEDMEM_Support_i.hxx | 4 +- src/MedClient/src/FIELDDOUBLEClient.hxx | 2 +- src/MedClient/src/FIELDINTClient.hxx | 2 +- src/MedClient/src/UtilClient.hxx | 6 +- src/MedClient/src/libMEDClient.i | 4 +- 12 files changed, 138 insertions(+), 54 deletions(-) diff --git a/INSTALL b/INSTALL index 53808c6a7..c504dbab8 100644 --- a/INSTALL +++ b/INSTALL @@ -1,3 +1,3 @@ -This is the version 2.0.1 of MED +This is the version 2.1.0 of MED Compatible with : - - KERNEL 2.0.0 with AG addings becarefull + - KERNEL 2.1.0 diff --git a/bin/VERSION b/bin/VERSION index bebf48fa8..339cb860c 100755 --- a/bin/VERSION +++ b/bin/VERSION @@ -1 +1 @@ -THIS IS SALOME - MED VERSION: 2.0.0 +THIS IS SALOME - MED VERSION: 2.1.0 diff --git a/doc/salome/tui/MED/HTML/MED.html b/doc/salome/tui/MED/HTML/MED.html index b8f484ade..8b1abaeb1 100644 --- a/doc/salome/tui/MED/HTML/MED.html +++ b/doc/salome/tui/MED/HTML/MED.html @@ -19,8 +19,16 @@
return_value = getMeshDimension ( )
-
string getCoordinateSystem ( )
-
return_value = getCoordinateSystem ( )
+
boolean getIsAGrid ( )
+
return_value = getIsAGrid ( )
+ + +
boolean existConnectivity ( in medConnectivity mode, in medEntityMesh entity )
+
return_value = existConnectivity ( mode, entity )
+ + +
string getCoordinatesSystem ( )
+
return_value = getCoordinatesSystem ( )
long getNumberOfNodes ( )
@@ -31,6 +39,10 @@
return_value = getCoordinates ( typeSwitch )
+
double getCoordinate ( in long Number, in long Axis )
+
return_value = getCoordinate ( Number, Axis )
+ +
string_array getCoordinatesNames ( )
return_value = getCoordinatesNames ( )
@@ -39,6 +51,22 @@
return_value = getCoordinatesUnits ( )
+
SUPPORT getBoundaryElements ( in medEntityMesh Entity )
+
return_value = getBoundaryElements ( Entity )
+ + +
SUPPORT getSkin ( in SUPPORT mySupport3D )
+
return_value = getSkin ( mySupport3D )
+ + +
long_array getGlobalNumberingIndex ( in medEntityMesh entity )
+
return_value = getGlobalNumberingIndex ( entity )
+ + +
coordinateInfos getCoordGlobal ( )
+
return_value = getCoordGlobal ( )
+ +
long getNumberOfTypes ( in medEntityMesh entity )
return_value = getNumberOfTypes ( entity )
@@ -63,6 +91,10 @@
return_value = getElementNumber ( mode, entity, type, connectivity )
+
medGeometryElement getElementType ( in medEntityMesh entity, in long number )
+
return_value = getElementType ( entity, number )
+ +
long_array getReverseConnectivity ( in medConnectivity mode )
return_value = getReverseConnectivity ( mode )
@@ -71,6 +103,10 @@
return_value = getReverseConnectivityIndex ( mode )
+
connectivityInfos getConnectGlobal ( in medEntityMesh entity )
+
return_value = getConnectGlobal ( entity )
+ +
long getNumberOfFamilies ( in medEntityMesh entity )
return_value = getNumberOfFamilies ( entity )
@@ -138,6 +174,10 @@
long getCorbaIndex ( )
return_value = getCorbaIndex ( )
+ +
meshInfos getMeshGlobal ( )
+
return_value = getMeshGlobal ( )
+
@@ -171,6 +211,10 @@ + + + + @@ -183,13 +227,25 @@ - - + + + + + + + + + + + + + +
return_value = getNumberOfElements ( geomElement )
long getNumberOfTypes ( )
return_value = getNumberOfTypes ( )
medGeometryElement_array getTypes ( )
return_value = getTypes ( )
return_value = getNumberIndex ( )
long getNumberOfGaussPoints ( in medGeometryElement geomElement )
return_value = getNumberOfGaussPoints ( geomElement )
long getNumberOfGaussPoint ( in medGeometryElement geomElement )
return_value = getNumberOfGaussPoint ( geomElement )
long_array getNumbersOfGaussPoint ( )
return_value = getNumbersOfGaussPoint ( )
void getBoundaryElements ( )
getBoundaryElements ( )
long getCorbaIndex ( )
return_value = getCorbaIndex ( )
supportInfos getSupportGlobal ( )
return_value = getSupportGlobal ( )

@@ -230,6 +286,18 @@ + + + + + + + + + + + +
string getAttributeDescription ( in long i )
return_value = getAttributeDescription ( i )
long getNumberOfGroups ( )
return_value = getNumberOfGroups ( )
string_array getGroupsNames ( )
return_value = getGroupsNames ( )
string getGroupName ( in long i )
return_value = getGroupName ( i )

@@ -383,6 +451,18 @@ + + + + + + + + + + + + diff --git a/doc/salome/tui/MED/doxyfile b/doc/salome/tui/MED/doxyfile index cb8f40fbd..1bba3b632 100755 --- a/doc/salome/tui/MED/doxyfile +++ b/doc/salome/tui/MED/doxyfile @@ -3,7 +3,7 @@ #--------------------------------------------------------------------------- # General configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "SALOME - MED - v.2.0.0" +PROJECT_NAME = "SALOME - MED - v.2.1.0" PROJECT_NUMBER = id#1.1 OUTPUT_DIRECTORY = ../ OUTPUT_LANGUAGE = English diff --git a/doc/salome/tui/MED/sources/static/tree.js b/doc/salome/tui/MED/sources/static/tree.js index 106210c35..d410052c4 100755 --- a/doc/salome/tui/MED/sources/static/tree.js +++ b/doc/salome/tui/MED/sources/static/tree.js @@ -1,4 +1,4 @@ -foldersTree = gFld("SALOME v.2.0.0 ", "", "") +foldersTree = gFld("SALOME v.2.1.0 ", "", "") insDoc(foldersTree, gLnk("Main Page", "", "main.html")) aux1 = insFld(foldersTree, gFld("TUI Reference Guide", "")) diff --git a/resources/MEDCatalog.xml b/resources/MEDCatalog.xml index 3a0361a7b..7581059bd 100644 --- a/resources/MEDCatalog.xml +++ b/resources/MEDCatalog.xml @@ -16,7 +16,7 @@ MedMESHPatrick GOLDBRONN - 1.0 + 2.1.0MED memoire1ModuleMed.png diff --git a/src/MED/Med_Gen_i.cxx b/src/MED/Med_Gen_i.cxx index 6ca2169a5..9622592ad 100755 --- a/src/MED/Med_Gen_i.cxx +++ b/src/MED/Med_Gen_i.cxx @@ -508,17 +508,18 @@ SALOMEDS::TMPFile* Med_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent, SALOMEDS::TMPFile_var aStreamFile; // Get a temporary directory to store a file - TCollection_AsciiString aTmpDir = (isMultiFile)?TCollection_AsciiString((char*)theURL):SALOMEDS_Tool::GetTmpDir(); + TCollection_AsciiString aTmpDir = (isMultiFile)?TCollection_AsciiString((char*)theURL):(char*)SALOMEDS_Tool::GetTmpDir().c_str(); // Create a list to store names of created files SALOMEDS::ListOfFileNames_var aSeq = new SALOMEDS::ListOfFileNames; TColStd_SequenceOfAsciiString aFileNames; CORBA::String_var aSaveStudyName(""); - if (isMultiFile) aSaveStudyName = strdup(SALOMEDS_Tool::GetNameFromPath(theComponent->GetStudy()->URL())); + if (isMultiFile) aSaveStudyName = CORBA::string_dup(SALOMEDS_Tool::GetNameFromPath(theComponent->GetStudy()->URL()).c_str()); SALOMEDS::SObject_var aMedMeshFather = theComponent->GetStudy()->FindObject("MEDMESH"); if (!CORBA::is_nil(aMedMeshFather)) { SALOMEDS::ChildIterator_var anIter = theComponent->GetStudy()->NewChildIterator(aMedMeshFather); + anIter->InitEx(1); for(; anIter->More(); anIter->Next()) { SALOMEDS::SObject_var aSO = anIter->Value(); SALOMEDS::GenericAttribute_var anAttr; @@ -526,7 +527,7 @@ SALOMEDS::TMPFile* Med_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent, CORBA::Object_var myIOR = _orb->string_to_object(SALOMEDS::AttributeIOR::_narrow(anAttr)->Value()); SALOME_MED::MESH_var myMesh = SALOME_MED::MESH::_narrow(myIOR); if (! CORBA::is_nil(myMesh)) { - TCollection_AsciiString aName(strdup(aSaveStudyName)); + TCollection_AsciiString aName(aSaveStudyName); aName += "_MEDMESH_"; aName += myMesh->getName(); aName += ".med"; @@ -542,6 +543,7 @@ SALOMEDS::TMPFile* Med_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent, SALOMEDS::SObject_var aMedFieldFather = theComponent->GetStudy()->FindObject("MEDFIELD"); if (!CORBA::is_nil(aMedFieldFather)) { SALOMEDS::ChildIterator_var anIter = theComponent->GetStudy()->NewChildIterator(aMedFieldFather); + anIter->InitEx(1); for(; anIter->More(); anIter->Next()) { SALOMEDS::SObject_var aSO = anIter->Value(); SALOMEDS::GenericAttribute_var anAttr; @@ -553,13 +555,13 @@ SALOMEDS::TMPFile* Med_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent, a<< myField->getOrderNumber(); b<< myField->getIterationNumber(); - TCollection_AsciiString aName(strdup(aSaveStudyName)); + TCollection_AsciiString aName(aSaveStudyName); aName += "_MEDFIELD_"; aName += myField->getName(); aName += "_ORDRE_"; - aName += strdup(a.str().c_str()); + aName += (char*)(a.str().c_str()); aName += "_ITER_"; - aName += strdup(b.str().c_str()); + aName += (char*)(b.str().c_str()); aName += ".med"; MESSAGE("Save mesh with name "<addDriver(SALOME_MED::MED_DRIVER,(aTmpDir+aName).ToCString(),myField->getName()); @@ -591,17 +593,18 @@ SALOMEDS::TMPFile* Med_Gen_i::SaveASCII(SALOMEDS::SComponent_ptr theComponent, SALOMEDS::TMPFile_var aStreamFile; // Get a temporary directory to store a file - TCollection_AsciiString aTmpDir = (isMultiFile)?TCollection_AsciiString((char*)theURL):SALOMEDS_Tool::GetTmpDir(); + TCollection_AsciiString aTmpDir = (isMultiFile)?TCollection_AsciiString((char*)theURL):(char*)SALOMEDS_Tool::GetTmpDir().c_str(); // Create a list to store names of created files SALOMEDS::ListOfFileNames_var aSeq = new SALOMEDS::ListOfFileNames; TColStd_SequenceOfAsciiString aFileNames; CORBA::String_var aSaveStudyName(""); - if (isMultiFile) aSaveStudyName = strdup(SALOMEDS_Tool::GetNameFromPath(theComponent->GetStudy()->URL())); + if (isMultiFile) aSaveStudyName = CORBA::string_dup(SALOMEDS_Tool::GetNameFromPath(theComponent->GetStudy()->URL()).c_str()); SALOMEDS::SObject_var aMedMeshFather = theComponent->GetStudy()->FindObject("MEDMESH"); if (!CORBA::is_nil(aMedMeshFather)) { SALOMEDS::ChildIterator_var anIter = theComponent->GetStudy()->NewChildIterator(aMedMeshFather); + anIter->InitEx(1); for(; anIter->More(); anIter->Next()) { SALOMEDS::SObject_var aSO = anIter->Value(); SALOMEDS::GenericAttribute_var anAttr; @@ -609,14 +612,14 @@ SALOMEDS::TMPFile* Med_Gen_i::SaveASCII(SALOMEDS::SComponent_ptr theComponent, CORBA::Object_var myIOR = _orb->string_to_object(SALOMEDS::AttributeIOR::_narrow(anAttr)->Value()); SALOME_MED::MESH_var myMesh = SALOME_MED::MESH::_narrow(myIOR); if (! CORBA::is_nil(myMesh)) { - TCollection_AsciiString aName(strdup(aSaveStudyName)); + TCollection_AsciiString aName(aSaveStudyName); aName += "_MEDMESH_"; aName += myMesh->getName(); aName += ".med"; MESSAGE("Save mesh with name "<addDriver(SALOME_MED::MED_DRIVER,(aTmpDir+aName).ToCString(),myMesh->getName()); myMesh->write(driverId,""); - HDFascii::ConvertFromHDFToASCII(strdup((aTmpDir+aName).ToCString()), true); + HDFascii::ConvertFromHDFToASCII((aTmpDir+aName).ToCString(), true); aFileNames.Append(aName); } } @@ -626,6 +629,7 @@ SALOMEDS::TMPFile* Med_Gen_i::SaveASCII(SALOMEDS::SComponent_ptr theComponent, SALOMEDS::SObject_var aMedFieldFather = theComponent->GetStudy()->FindObject("MEDFIELD"); if (!CORBA::is_nil(aMedFieldFather)) { SALOMEDS::ChildIterator_var anIter = theComponent->GetStudy()->NewChildIterator(aMedFieldFather); + anIter->InitEx(1); for(; anIter->More(); anIter->Next()) { SALOMEDS::SObject_var aSO = anIter->Value(); SALOMEDS::GenericAttribute_var anAttr; @@ -637,18 +641,18 @@ SALOMEDS::TMPFile* Med_Gen_i::SaveASCII(SALOMEDS::SComponent_ptr theComponent, a<< myField->getOrderNumber(); b<< myField->getIterationNumber(); - TCollection_AsciiString aName(strdup(aSaveStudyName)); + TCollection_AsciiString aName(aSaveStudyName); aName += "_MEDFIELD_"; aName += myField->getName(); aName += "_ORDRE_"; - aName += strdup(a.str().c_str()); + aName += (char*)(a.str().c_str()); aName += "_ITER_"; - aName += strdup(b.str().c_str()); + aName += (char*)(b.str().c_str()); aName += ".med"; MESSAGE("Save mesh with name "<addDriver(SALOME_MED::MED_DRIVER,(aTmpDir+aName).ToCString(),myField->getName()); myField->write(driverId,""); - HDFascii::ConvertFromHDFToASCII(strdup((aTmpDir+aName).ToCString()), true); + HDFascii::ConvertFromHDFToASCII((aTmpDir+aName).ToCString(), true); aFileNames.Append(aName); } } @@ -683,7 +687,7 @@ CORBA::Boolean Med_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent, // Get a temporary directory for a file TCollection_AsciiString aTmpDir = - (isMultiFile)?TCollection_AsciiString((char*)theURL):SALOMEDS_Tool::GetTmpDir(); + (isMultiFile)?TCollection_AsciiString((char*)theURL):(char*)SALOMEDS_Tool::GetTmpDir().c_str(); _saveFileName = CORBA::string_dup(aTmpDir.ToCString()); SALOMEDS::ListOfFileNames_var aSeq = SALOMEDS_Tool::PutStreamToFiles(theStream, aTmpDir.ToCString(), isMultiFile); @@ -732,7 +736,7 @@ void Med_Gen_i::Close(SALOMEDS::SComponent_ptr theComponent) char* Med_Gen_i::ComponentDataType() { MESSAGE("Med_Gen_i::ComponentDataType"); - return strdup("MED") ; /* What is this type ? */ + return CORBA::string_dup("MED") ; /* What is this type ? */ } //============================================================================= @@ -761,7 +765,7 @@ char* Med_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject, { // nothing to save : Support will be saved inside the mesh string str_MedName="_MED Objet Med + /OBJ_MED/"; - return strdup(str_MedName.c_str()) ; + return CORBA::string_dup(str_MedName.c_str()) ; } // MESH @@ -769,7 +773,7 @@ char* Med_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject, if (! CORBA::is_nil(myMesh)) { CORBA::String_var aName((string("_MEDMESH_")+ myMesh->getName() + ".med").c_str()); - return strdup(aName._retn()) ; + return aName._retn() ; } // SUPPORT @@ -790,7 +794,7 @@ char* Med_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject, THROW_SALOME_CORBA_EXCEPTION("Unable to save Field in Med"\ ,SALOME::INTERNAL_ERROR); } - return strdup(("_MED"+str_SupportName).c_str()); + return CORBA::string_dup(("_MED"+str_SupportName).c_str()); } SALOME_MED::FIELD_var myField = SALOME_MED::FIELD::_narrow(myIOR); @@ -804,7 +808,7 @@ char* Med_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject, string("_ORDRE_")+a.str()+ string("_ITER_")+b.str() + ".med").c_str()); - return strdup(aName._retn()); + return aName._retn(); } //THROW_SALOME_CORBA_EXCEPTION("Unable to save IOR",SALOME::BAD_PARAM); @@ -827,12 +831,12 @@ char* Med_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject, { const char * LOC = "Med_Gen_i::LocalPersistentIDToIOR" ; BEGIN_OF(LOC) ; - TCollection_AsciiString aTmpDir(CORBA::string_dup(_saveFileName.c_str())); + TCollection_AsciiString aTmpDir((char*)(_saveFileName.c_str())); TCollection_AsciiString aSaveStudyName(""); - if (isMultiFile) aSaveStudyName = strdup(SALOMEDS_Tool::GetNameFromPath(theSObject->GetStudy()->URL())); + if (isMultiFile) aSaveStudyName = (char*)SALOMEDS_Tool::GetNameFromPath(theSObject->GetStudy()->URL()).c_str(); - if (strcmp(aLocalPersistentID, "Objet Med + /OBJ_MED/") == 0) return strdup(""); // MED + if (strcmp(aLocalPersistentID, "Objet Med + /OBJ_MED/") == 0) return CORBA::string_dup(""); // MED if (strncmp(aLocalPersistentID, "_MEDMESH_",9) == 0) {// MESH MESH * myMesh= new MESH() ; @@ -844,11 +848,11 @@ char* Med_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject, char* aFileName; if (isASCII) { - char* aResultPath = HDFascii::ConvertFromASCIIToHDF((aTmpDir + strdup(aLocalPersistentID)).ToCString()); + char* aResultPath = HDFascii::ConvertFromASCIIToHDF((aTmpDir + aSaveStudyName + (char*)aLocalPersistentID).ToCString()); aFileName = new char[strlen(aResultPath) + 19]; sprintf(aFileName, "%shdf_from_ascii.hdf", aResultPath); delete(aResultPath); - } else aFileName = strdup((aTmpDir + aSaveStudyName + strdup(aLocalPersistentID)).ToCString()); + } else aFileName = CORBA::string_dup((aTmpDir + aSaveStudyName + (char*)aLocalPersistentID).ToCString()); MED_MESH_RDONLY_DRIVER myMeshDriver(aFileName,myMesh); try { @@ -883,16 +887,16 @@ char* Med_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject, if (isASCII) { SALOMEDS::ListOfFileNames_var aFilesToRemove = new SALOMEDS::ListOfFileNames; aFilesToRemove->length(1); - aFilesToRemove[0] = strdup(&(aFileName[strlen(SALOMEDS_Tool::GetDirFromPath(aFileName))])); - SALOMEDS_Tool::RemoveTemporaryFiles(SALOMEDS_Tool::GetDirFromPath(aFileName), aFilesToRemove, true); + aFilesToRemove[0] = CORBA::string_dup(&(aFileName[strlen(SALOMEDS_Tool::GetDirFromPath(aFileName).c_str())])); + SALOMEDS_Tool::RemoveTemporaryFiles(SALOMEDS_Tool::GetDirFromPath(aFileName).c_str(), aFilesToRemove, true); } delete(aFileName); return(CORBA::string_dup(_orb->object_to_string(mesh))); } else if (strncmp(aLocalPersistentID, "_MEDFIELD_",14) == 0) { // FIELD - return(strdup("")); // not implemented yet + return(CORBA::string_dup("")); // not implemented yet } - return strdup(""); + return CORBA::string_dup(""); END_OF(LOC) ; } @@ -988,21 +992,21 @@ SALOMEDS::TMPFile* Med_Gen_i::CopyFrom(SALOMEDS::SObject_ptr theObject, CORBA::L // Try to get GEOM_Shape object by given SObject SALOMEDS::GenericAttribute_var anAttr; if (!theObject->FindAttribute(anAttr, "AttributeIOR")) return new SALOMEDS::TMPFile(0); - CORBA::String_var anIOR = strdup(SALOMEDS::AttributeIOR::_narrow(anAttr)->Value()); + CORBA::String_var anIOR = CORBA::string_dup(SALOMEDS::AttributeIOR::_narrow(anAttr)->Value()); CORBA::Object_var anObj = _orb->string_to_object(anIOR); SALOME_MED::MESH_var aMesh = SALOME_MED::MESH::_narrow(anObj); if (aMesh->_is_nil()) return new SALOMEDS::TMPFile(0); // Get a temporary directory to store a temporary file - CORBA::String_var aTmpDir = SALOMEDS_Tool::GetTmpDir(); + CORBA::String_var aTmpDir = SALOMEDS_Tool::GetTmpDir().c_str(); // Create a list to store names of created files SALOMEDS::ListOfFileNames_var aSeq = new SALOMEDS::ListOfFileNames; aSeq->length(1); - aSeq[0] = strdup(aMesh->getName()); + aSeq[0] = CORBA::string_dup(aMesh->getName()); char* aFullName = new char[strlen(aTmpDir)+strlen(aSeq[0])+1]; strcpy(aFullName, aTmpDir); strcpy(aFullName+strlen(aTmpDir), aSeq[0]); - long driverId = aMesh->addDriver(SALOME_MED::MED_DRIVER,strdup(aFullName) , aMesh->getName()); + long driverId = aMesh->addDriver(SALOME_MED::MED_DRIVER,aFullName , aMesh->getName()); aMesh->write(driverId,""); delete(aFullName); @@ -1040,9 +1044,9 @@ SALOMEDS::SObject_ptr Med_Gen_i::PasteInto(const SALOMEDS::TMPFile& theStream, SALOMEDS::Study_var aStudy = theObject->GetStudy(); - CORBA::String_var aTmpDir = strdup(SALOMEDS_Tool::GetTmpDir()); + CORBA::String_var aTmpDir = CORBA::string_dup(SALOMEDS_Tool::GetTmpDir().c_str()); SALOMEDS::ListOfFileNames_var aSeq = SALOMEDS_Tool::PutStreamToFiles(theStream, aTmpDir, false); - CORBA::String_var aMeshName = strdup(aSeq[0]); + CORBA::String_var aMeshName = CORBA::string_dup(aSeq[0]); char* aFullName = new char[strlen(aTmpDir)+strlen(aMeshName)+1]; strcpy(aFullName, aTmpDir); strcpy(aFullName+strlen(aTmpDir), aMeshName); diff --git a/src/MEDMEM_I/MEDMEM_Support_i.hxx b/src/MEDMEM_I/MEDMEM_Support_i.hxx index f35bf9e63..d06a62d79 100644 --- a/src/MEDMEM_I/MEDMEM_Support_i.hxx +++ b/src/MEDMEM_I/MEDMEM_Support_i.hxx @@ -27,7 +27,7 @@ class SUPPORT_i: public POA_SALOME_MED::SUPPORT, public SALOMEMultiComm { public : - static map < int,::MEDMEM::SUPPORT *> supportMap; + static std::map < int,::MEDMEM::SUPPORT *> supportMap; private : static int supportIndex; @@ -36,7 +36,7 @@ protected : // C++ object containing values const ::MEDMEM::SUPPORT * const _support; const int _corbaIndex ; - string _supportId ; + std::string _supportId ; public: diff --git a/src/MedClient/src/FIELDDOUBLEClient.hxx b/src/MedClient/src/FIELDDOUBLEClient.hxx index 61252201a..0e8b38883 100644 --- a/src/MedClient/src/FIELDDOUBLEClient.hxx +++ b/src/MedClient/src/FIELDDOUBLEClient.hxx @@ -8,7 +8,7 @@ class FIELDDOUBLEClient : { public: FIELDDOUBLEClient(SALOME_MED::FIELDDOUBLE_ptr ptrCorba, - SUPPORT * S = NULL); + MEDMEM::SUPPORT * S = NULL); ~FIELDDOUBLEClient(); }; diff --git a/src/MedClient/src/FIELDINTClient.hxx b/src/MedClient/src/FIELDINTClient.hxx index 60de96c30..9b5236980 100644 --- a/src/MedClient/src/FIELDINTClient.hxx +++ b/src/MedClient/src/FIELDINTClient.hxx @@ -8,7 +8,7 @@ class FIELDINTClient : { public: FIELDINTClient(SALOME_MED::FIELDINT_ptr ptrCorba, - SUPPORT * S = NULL); + MEDMEM::SUPPORT * S = NULL); ~FIELDINTClient(); }; diff --git a/src/MedClient/src/UtilClient.hxx b/src/MedClient/src/UtilClient.hxx index 87dc7e165..30fad3efb 100644 --- a/src/MedClient/src/UtilClient.hxx +++ b/src/MedClient/src/UtilClient.hxx @@ -44,7 +44,7 @@ inline void convertCorbaArray (TLocal * & T, long &nT, const TCorbaSeq & S, template -inline void convertCorbaArray (vector & T, int &nT, +inline void convertCorbaArray (std::vector & T, int &nT, const TCorbaSeq & S) { int i, n = S->length(); @@ -64,7 +64,7 @@ inline void convertCorbaArray (vector & T, int &nT, template -inline void convertCorbaArray (vector & T, int &nT, +inline void convertCorbaArray (std::vector & T, int &nT, const TCorbaSeq & S, void *f) { @@ -90,7 +90,7 @@ template -inline void convertCorbaArray (vector & T, +inline void convertCorbaArray (std::vector & T, const TCorbaSeq & S, void *f, TInfo M) { diff --git a/src/MedClient/src/libMEDClient.i b/src/MedClient/src/libMEDClient.i index e0cf95516..408f846e9 100644 --- a/src/MedClient/src/libMEDClient.i +++ b/src/MedClient/src/libMEDClient.i @@ -41,7 +41,7 @@ class SUPPORTClient : public SUPPORT { class FIELDDOUBLEClient : public FIELDDOUBLE { public: FIELDDOUBLEClient(SALOME_MED::FIELDDOUBLE_ptr ptrCorba, - SUPPORT * S = NULL); + MEDMEM::SUPPORT * S = NULL); ~FIELDDOUBLEClient(); }; @@ -49,7 +49,7 @@ public: class FIELDINTClient : public FIELDINT { public: FIELDINTClient(SALOME_MED::FIELDINT_ptr ptrCorba, - SUPPORT * S = NULL); + MEDMEM::SUPPORT * S = NULL); ~FIELDINTClient(); }; -- 2.39.2
return_value = getMesh ( fieldPtr )
long getFieldNumberOfIteration ( in string fieldName )
return_value = getFieldNumberOfIteration ( fieldName )
long_array getFieldIteration ( in string fieldName, in long i )
return_value = getFieldIteration ( fieldName, i )
long_array getFieldIterations ( in string fieldName )
return_value = getFieldIterations ( fieldName )
FIELD getField ( in string fieldName, in long pasTemps, in long numOrdre )
return_value = getField ( fieldName, pasTemps, numOrdre )