-// Copyright (C) 2011-2015 CEA/DEN, EDF R&D
+// Copyright (C) 2011-2022 CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
#include "YACSDriver.hxx"
#include "HOMARD.hxx"
+#include "FrontTrack.hxx"
+
#include "HOMARD_version.h"
#include "utilities.h"
+#include "Basics_Utils.hxx"
+#include "Basics_DirUtils.hxx"
#include "Utils_SINGLETON.hxx"
#include "Utils_CorbaException.hxx"
#include "SALOMEDS_Tool.hxx"
#include "SALOME_LifeCycleCORBA.hxx"
#include "SALOMEconfig.h"
-#include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog)
-#include CORBA_CLIENT_HEADER(SMESH_Gen)
+#include <SMESH_Gen_i.hxx>
#include <cmath>
#include <stdlib.h>
PortableServer::POA_ptr poa,
PortableServer::ObjectId * contId,
const char *instanceName,
- const char *interfaceName) :
-Engines_Component_i(orb, poa, contId, instanceName, interfaceName)
+ const char *interfaceName,
+ bool checkNS) :
+Engines_Component_i(orb, poa, contId, instanceName, interfaceName, false, checkNS)
{
- MESSAGE("constructor");
+ MESSAGE("constructor de HOMARD_Gen_i");
_thisObj = this;
_id = _poa->activate_object(_thisObj);
- myHomard = new ::HOMARD_Gen();
- _NS = SINGLETON_<SALOME_NamingService>::Instance();
- ASSERT(SINGLETON_<SALOME_NamingService>::IsAlreadyExisting());
- _NS->init_orb(_orb);
+ myHomard = new ::HOMARD_Gen;
_tag_gene = 0 ;
_tag_boun = 0 ;
// Utilitaires pour l'étude
//=============================================================================
//=============================================================================
-void HOMARD_Gen_i::addInStudy(SALOMEDS::Study_ptr theStudy)
+void HOMARD_Gen_i::UpdateStudy()
{
- ASSERT(!CORBA::is_nil(theStudy));
- MESSAGE("addInStudy: ajout eventuel du composant HOMARD dans current study ID = " << GetCurrentStudyID()) ;
- SALOMEDS::StudyBuilder_var myBuilder = theStudy->NewBuilder();
+ ASSERT(!CORBA::is_nil(myStudy));
+ SALOMEDS::StudyBuilder_var myBuilder = myStudy->NewBuilder();
// Create SComponent labelled 'homard' if it doesn't already exit
- SALOMEDS::SComponent_var homardFather = theStudy->FindComponent(ComponentDataType());
+ SALOMEDS::SComponent_var homardFather = myStudy->FindComponent(ComponentDataType());
if (CORBA::is_nil(homardFather))
{
myBuilder->NewCommand();
MESSAGE("Add Component HOMARD");
- bool aLocked = theStudy->GetProperties()->IsLocked();
- if (aLocked) theStudy->GetProperties()->SetLocked(false);
+ bool aLocked = myStudy->GetProperties()->IsLocked();
+ if (aLocked) myStudy->GetProperties()->SetLocked(false);
homardFather = myBuilder->NewComponent(ComponentDataType());
SALOMEDS::GenericAttribute_var anAttr = myBuilder->FindOrCreateAttribute(homardFather,"AttributeName");
SALOMEDS::AttributeName_var aName = SALOMEDS::AttributeName::_narrow(anAttr);
- CORBA::Object_var objVarN = _NS->Resolve("/Kernel/ModulCatalog");
- SALOME_ModuleCatalog::ModuleCatalog_var Catalogue =
- SALOME_ModuleCatalog::ModuleCatalog::_narrow(objVarN);
+ SALOME_ModuleCatalog::ModuleCatalog_var Catalogue = this->getModuleCatalog();
SALOME_ModuleCatalog::Acomponent_var Comp = Catalogue->GetComponent(ComponentDataType());
if (!Comp->_is_nil())
{
aPixmap->SetPixMap("HOMARD_2.png");
myBuilder->DefineComponentInstance(homardFather, HOMARD_Gen::_this());
- if (aLocked) theStudy->GetProperties()->SetLocked(true);
+ if (aLocked) myStudy->GetProperties()->SetLocked(true);
myBuilder->CommitCommand();
}
}
-//=============================================================================
-void HOMARD_Gen_i::SetCurrentStudy(SALOMEDS::Study_ptr theStudy)
-{
- MESSAGE("SetCurrentStudy: current study Id = " << GetCurrentStudyID());
- myCurrentStudy = SALOMEDS::Study::_duplicate(theStudy);
- this->addInStudy(myCurrentStudy);
-}
-//=============================================================================
-SALOMEDS::Study_ptr HOMARD_Gen_i::GetCurrentStudy()
-//=============================================================================
-{
- MESSAGE("GetCurrentStudy: study Id = " << GetCurrentStudyID());
- return SALOMEDS::Study::_duplicate(myCurrentStudy);
-}
-//=============================================================================
-CORBA::Long HOMARD_Gen_i::GetCurrentStudyID()
-//=============================================================================
-{
- return myCurrentStudy->_is_nil() ? -1 : myCurrentStudy->StudyId();
-}
-//=============================================================================
-//=============================================================================
//=============================================================================
//=============================================================================
//=====================================================================================
{
MESSAGE( "SetEtatIter : affectation de l'etat " << Etat << " a l'iteration " << nomIter );
- HOMARD::HOMARD_Iteration_var myIteration = myContextMap[GetCurrentStudyID()]._mesIterations[nomIter];
+ HOMARD::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[nomIter];
if (CORBA::is_nil(myIteration))
{
SALOME::ExceptionStruct es;
myIteration->SetState(Etat);
- SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
- SALOMEDS::SObject_var aIterSO = SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myIteration)));
+ SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
+ SALOMEDS::SObject_var aIterSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myIteration)));
std::string icone ;
if ( Etat <= 0 )
CORBA::Long HOMARD_Gen_i::DeleteBoundary(const char* BoundaryName)
{
MESSAGE ( "DeleteBoundary : BoundaryName = " << BoundaryName );
- HOMARD::HOMARD_Boundary_var myBoundary = myContextMap[GetCurrentStudyID()]._mesBoundarys[BoundaryName];
+ HOMARD::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[BoundaryName];
if (CORBA::is_nil(myBoundary))
{
SALOME::ExceptionStruct es;
{
CaseName = std::string((*maListe)[NumeCas]);
MESSAGE ( "... Examen du cas = " << CaseName.c_str() );
- myCase = myContextMap[GetCurrentStudyID()]._mesCas[CaseName];
+ myCase = myStudyContext._mesCas[CaseName];
ASSERT(!CORBA::is_nil(myCase));
ListBoundaryGroupType = myCase->GetBoundaryGroup();
numberOfitems = ListBoundaryGroupType->length();
}
// comme on a un _var comme pointeur CORBA, on ne se preoccupe pas du delete
- myContextMap[GetCurrentStudyID()]._mesBoundarys.erase(BoundaryName);
- SALOMEDS::Study::ListOfSObject_var listSO = myCurrentStudy->FindObjectByName(BoundaryName, ComponentDataType());
+ myStudyContext._mesBoundarys.erase(BoundaryName);
+ SALOMEDS::Study::ListOfSObject_var listSO = myStudy->FindObjectByName(BoundaryName, ComponentDataType());
SALOMEDS::SObject_var aSO =listSO[0];
- SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
- myCurrentStudy->NewBuilder()->RemoveObjectWithChildren(aSO);
+ SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
+ myStudy->NewBuilder()->RemoveObjectWithChildren(aSO);
return 0 ;
}
{
// Pour detruire un cas
MESSAGE ( "DeleteCase : nomCas = " << nomCas << ", avec option = " << Option );
- HOMARD::HOMARD_Cas_var myCase = myContextMap[GetCurrentStudyID()]._mesCas[nomCas];
+ HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas];
if (CORBA::is_nil(myCase))
{
SALOME::ExceptionStruct es;
};
// comme on a un _var comme pointeur CORBA, on ne se preoccupe pas du delete
- myContextMap[GetCurrentStudyID()]._mesCas.erase(nomCas);
- SALOMEDS::Study::ListOfSObject_var listSO = myCurrentStudy->FindObjectByName(nomCas, ComponentDataType());
+ myStudyContext._mesCas.erase(nomCas);
+ SALOMEDS::Study::ListOfSObject_var listSO = myStudy->FindObjectByName(nomCas, ComponentDataType());
SALOMEDS::SObject_var aSO =listSO[0];
- SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
- myCurrentStudy->NewBuilder()->RemoveObjectWithChildren(aSO);
+ SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
+ myStudy->NewBuilder()->RemoveObjectWithChildren(aSO);
return 0 ;
}
CORBA::Long HOMARD_Gen_i::DeleteHypo(const char* nomHypo)
{
MESSAGE ( "DeleteHypo : nomHypo = " << nomHypo );
- HOMARD::HOMARD_Hypothesis_var myHypo = myContextMap[GetCurrentStudyID()]._mesHypotheses[nomHypo];
+ HOMARD::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypo];
if (CORBA::is_nil(myHypo))
{
SALOME::ExceptionStruct es;
}
// comme on a un _var comme pointeur CORBA, on ne se preoccupe pas du delete
- myContextMap[GetCurrentStudyID()]._mesHypotheses.erase(nomHypo);
- SALOMEDS::Study::ListOfSObject_var listSO = myCurrentStudy->FindObjectByName(nomHypo, ComponentDataType());
+ myStudyContext._mesHypotheses.erase(nomHypo);
+ SALOMEDS::Study::ListOfSObject_var listSO = myStudy->FindObjectByName(nomHypo, ComponentDataType());
SALOMEDS::SObject_var aSO =listSO[0];
- SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
- myCurrentStudy->NewBuilder()->RemoveObjectWithChildren(aSO);
+ SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
+ myStudy->NewBuilder()->RemoveObjectWithChildren(aSO);
return 0 ;
}
// Option2 = 0 : On ne supprime pas le fichier du maillage associe
// Option2 = 1 : On supprime le fichier du maillage associe
MESSAGE ( "DeleteIterationOption : nomIter = " << nomIter << ", avec options = " << Option1<< ", " << Option2 );
- HOMARD::HOMARD_Iteration_var myIteration = myContextMap[GetCurrentStudyID()]._mesIterations[nomIter];
+ HOMARD::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[nomIter];
if (CORBA::is_nil(myIteration))
{
SALOME::ExceptionStruct es;
{
std::string nomIterationParent = myIteration->GetIterParentName();
MESSAGE ( "Retrait dans la descendance de nomIterationParent " << nomIterationParent );
- HOMARD::HOMARD_Iteration_var myIterationParent = myContextMap[GetCurrentStudyID()]._mesIterations[nomIterationParent];
+ HOMARD::HOMARD_Iteration_var myIterationParent = myStudyContext._mesIterations[nomIterationParent];
if (CORBA::is_nil(myIterationParent))
{
SALOME::ExceptionStruct es;
if ( numero > 0 )
{
std::string nomHypo = myIteration->GetHypoName();
- HOMARD::HOMARD_Hypothesis_var myHypo = myContextMap[GetCurrentStudyID()]._mesHypotheses[nomHypo];
+ HOMARD::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypo];
ASSERT(!CORBA::is_nil(myHypo));
myHypo->UnLinkIteration(nomIter);
}
// comme on a un _var comme pointeur CORBA, on ne se preoccupe pas du delete
- myContextMap[GetCurrentStudyID()]._mesIterations.erase(nomIter);
- SALOMEDS::Study::ListOfSObject_var listSO = myCurrentStudy->FindObjectByName(nomIter, ComponentDataType());
+ myStudyContext._mesIterations.erase(nomIter);
+ SALOMEDS::Study::ListOfSObject_var listSO = myStudy->FindObjectByName(nomIter, ComponentDataType());
SALOMEDS::SObject_var aSO =listSO[0];
- SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
- myCurrentStudy->NewBuilder()->RemoveObjectWithChildren(aSO);
+ SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
+ myStudy->NewBuilder()->RemoveObjectWithChildren(aSO);
// on peut aussi faire RemoveObject
// MESSAGE ( "Au final" );
// HOMARD::listeIterations* Liste = GetAllIterationsName() ;
// Option = 0 : On ne supprime pas le fichier du schema associe
// Option = 1 : On supprime le fichier du schema associe
MESSAGE ( "DeleteYACS : nomYACS = " << nomYACS << ", avec option = " << Option );
- HOMARD::HOMARD_YACS_var myYACS = myContextMap[GetCurrentStudyID()]._mesYACSs[nomYACS];
+ HOMARD::HOMARD_YACS_var myYACS = myStudyContext._mesYACSs[nomYACS];
if (CORBA::is_nil(myYACS))
{
SALOME::ExceptionStruct es;
}
}
// comme on a un _var comme pointeur CORBA, on ne se preoccupe pas du delete
- myContextMap[GetCurrentStudyID()]._mesYACSs.erase(nomYACS);
- SALOMEDS::Study::ListOfSObject_var listSO = myCurrentStudy->FindObjectByName(nomYACS, ComponentDataType());
+ myStudyContext._mesYACSs.erase(nomYACS);
+ SALOMEDS::Study::ListOfSObject_var listSO = myStudy->FindObjectByName(nomYACS, ComponentDataType());
SALOMEDS::SObject_var aSO =listSO[0];
- SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
- myCurrentStudy->NewBuilder()->RemoveObjectWithChildren(aSO);
+ SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
+ myStudy->NewBuilder()->RemoveObjectWithChildren(aSO);
return 0 ;
}
CORBA::Long HOMARD_Gen_i::DeleteZone(const char* nomZone)
{
MESSAGE ( "DeleteZone : nomZone = " << nomZone );
- HOMARD::HOMARD_Zone_var myZone = myContextMap[GetCurrentStudyID()]._mesZones[nomZone];
+ HOMARD::HOMARD_Zone_var myZone = myStudyContext._mesZones[nomZone];
if (CORBA::is_nil(myZone))
{
SALOME::ExceptionStruct es;
{
SALOME::ExceptionStruct es;
es.type = SALOME::BAD_PARAM;
- es.text = "This zone is used in an hypothesis and cannot be deleted.";
+ es.text = "This zone is used in a hypothesis and cannot be deleted.";
throw SALOME::SALOME_Exception(es);
return 2 ;
};
//
// comme on a un _var comme pointeur CORBA, on ne se preoccupe pas du delete
- myContextMap[GetCurrentStudyID()]._mesZones.erase(nomZone);
- SALOMEDS::Study::ListOfSObject_var listSO = myCurrentStudy->FindObjectByName(nomZone, ComponentDataType());
+ myStudyContext._mesZones.erase(nomZone);
+ SALOMEDS::Study::ListOfSObject_var listSO = myStudy->FindObjectByName(nomZone, ComponentDataType());
SALOMEDS::SObject_var aSO =listSO[0];
- SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
- myCurrentStudy->NewBuilder()->RemoveObjectWithChildren(aSO);
+ SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
+ myStudy->NewBuilder()->RemoveObjectWithChildren(aSO);
return 0 ;
}
void HOMARD_Gen_i::InvalideBoundary(const char* BoundaryName)
{
MESSAGE( "InvalideBoundary : BoundaryName = " << BoundaryName );
- HOMARD::HOMARD_Boundary_var myBoundary = myContextMap[GetCurrentStudyID()]._mesBoundarys[BoundaryName];
+ HOMARD::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[BoundaryName];
if (CORBA::is_nil(myBoundary))
{
SALOME::ExceptionStruct es;
void HOMARD_Gen_i::InvalideHypo(const char* nomHypo)
{
MESSAGE( "InvalideHypo : nomHypo = " << nomHypo );
- HOMARD::HOMARD_Hypothesis_var myHypo = myContextMap[GetCurrentStudyID()]._mesHypotheses[nomHypo];
+ HOMARD::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypo];
if (CORBA::is_nil(myHypo))
{
SALOME::ExceptionStruct es;
// Option = 0 : On ne supprime pas le fichier du maillage associe
// Option = 1 : On supprime le fichier du maillage associe
MESSAGE ( "InvalideIterOption : nomIter = " << nomIter << ", avec option = " << Option );
- HOMARD::HOMARD_Iteration_var myIteration = myContextMap[GetCurrentStudyID()]._mesIterations[nomIter];
+ HOMARD::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[nomIter];
if (CORBA::is_nil(myIteration))
{
SALOME::ExceptionStruct es;
// On arrive ici pour une iteration sans fille
MESSAGE ( "Invalidation effective de " << nomIter );
- SALOMEDS::SObject_var aIterSO = SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myIteration)));
- SALOMEDS::ChildIterator_var aIter = myCurrentStudy->NewChildIterator(aIterSO);
+ SALOMEDS::SObject_var aIterSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myIteration)));
+ SALOMEDS::ChildIterator_var aIter = myStudy->NewChildIterator(aIterSO);
for (; aIter->More(); aIter->Next())
{
SALOMEDS::SObject_var so = aIter->Value();
std::string value (aCommentAttr->Value());
if(value == std::string("IterationHomard")) continue;
if(value == std::string("HypoHomard")) continue;
- SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+ SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
aStudyBuilder->RemoveObject(so);
}
{
SetEtatIter(nomIter,1);
const char * nomCas = myIteration->GetCaseName();
- HOMARD::HOMARD_Cas_var myCase = myContextMap[GetCurrentStudyID()]._mesCas[nomCas];
+ HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas];
if (CORBA::is_nil(myCase))
{
SALOME::ExceptionStruct es;
void HOMARD_Gen_i::InvalideIterInfo(const char* nomIter)
{
MESSAGE("InvalideIterInfo : nomIter = " << nomIter);
- HOMARD::HOMARD_Iteration_var myIteration = myContextMap[GetCurrentStudyID()]._mesIterations[nomIter];
+ HOMARD::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[nomIter];
if (CORBA::is_nil(myIteration))
{
SALOME::ExceptionStruct es;
return ;
};
- SALOMEDS::SObject_var aIterSO = SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myIteration)));
- SALOMEDS::ChildIterator_var aIter = myCurrentStudy->NewChildIterator(aIterSO);
+ SALOMEDS::SObject_var aIterSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myIteration)));
+ SALOMEDS::ChildIterator_var aIter = myStudy->NewChildIterator(aIterSO);
for (; aIter->More(); aIter->Next())
{
SALOMEDS::SObject_var so = aIter->Value();
/* MESSAGE("... value = " << value);*/
if( (value == std::string("logInfo")) || ( value == std::string("SummaryInfo")) )
{
- SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+ SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
aStudyBuilder->RemoveObject(so);
}
}
const char * nomCas = myIteration->GetCaseName();
- HOMARD::HOMARD_Cas_var myCase = myContextMap[GetCurrentStudyID()]._mesCas[nomCas];
+ HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas];
if (CORBA::is_nil(myCase))
{
SALOME::ExceptionStruct es;
void HOMARD_Gen_i::InvalideYACS(const char* YACSName)
{
MESSAGE( "InvalideYACS : YACSName = " << YACSName );
- HOMARD::HOMARD_YACS_var myYACS = myContextMap[GetCurrentStudyID()]._mesYACSs[YACSName];
+ HOMARD::HOMARD_YACS_var myYACS = myStudyContext._mesYACSs[YACSName];
if (CORBA::is_nil(myYACS))
{
SALOME::ExceptionStruct es;
return ;
};
//
- SALOMEDS::SObject_var aYACSSO = SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myYACS)));
- SALOMEDS::ChildIterator_var aYACS = myCurrentStudy->NewChildIterator(aYACSSO);
+ SALOMEDS::SObject_var aYACSSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myYACS)));
+ SALOMEDS::ChildIterator_var aYACS = myStudy->NewChildIterator(aYACSSO);
for (; aYACS->More(); aYACS->Next())
{
SALOMEDS::SObject_var so = aYACS->Value();
std::string value (aCommentAttr->Value());
if( value == std::string("xml") )
{
- SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+ SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
aStudyBuilder->RemoveObject(so);
}
}
void HOMARD_Gen_i::InvalideZone(const char* ZoneName)
{
MESSAGE( "InvalideZone : ZoneName = " << ZoneName );
- HOMARD::HOMARD_Zone_var myZone = myContextMap[GetCurrentStudyID()]._mesZones[ZoneName];
+ HOMARD::HOMARD_Zone_var myZone = myStudyContext._mesZones[ZoneName];
if (CORBA::is_nil(myZone))
{
SALOME::ExceptionStruct es;
{
MESSAGE( "AssociateCaseIter : " << nomCas << ", " << nomIter << ", " << labelIter );
- HOMARD::HOMARD_Cas_var myCase = myContextMap[GetCurrentStudyID()]._mesCas[nomCas];
+ HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas];
if (CORBA::is_nil(myCase))
{
SALOME::ExceptionStruct es;
return ;
};
- HOMARD::HOMARD_Iteration_var myIteration = myContextMap[GetCurrentStudyID()]._mesIterations[nomIter];
+ HOMARD::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[nomIter];
if (CORBA::is_nil(myIteration))
{
SALOME::ExceptionStruct es;
return ;
};
- SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
- SALOMEDS::SObject_var aCasSO = SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myCase)));
+ SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
+ SALOMEDS::SObject_var aCasSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myCase)));
if (CORBA::is_nil(aCasSO))
{
SALOME::ExceptionStruct es;
{
MESSAGE ( "AssociateHypoZone : nomHypo = " << nomHypothesis << ", ZoneName= " << ZoneName << ", TypeUse = " << TypeUse);
- HOMARD::HOMARD_Hypothesis_var myHypo = myContextMap[GetCurrentStudyID()]._mesHypotheses[nomHypothesis];
+ HOMARD::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypothesis];
ASSERT(!CORBA::is_nil(myHypo));
- SALOMEDS::SObject_var aHypoSO = SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myHypo)));
+ SALOMEDS::SObject_var aHypoSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myHypo)));
ASSERT(!CORBA::is_nil(aHypoSO));
- HOMARD::HOMARD_Zone_var myZone = myContextMap[GetCurrentStudyID()]._mesZones[ZoneName];
+ HOMARD::HOMARD_Zone_var myZone = myStudyContext._mesZones[ZoneName];
ASSERT(!CORBA::is_nil(myZone));
- SALOMEDS::SObject_var aZoneSO = SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myZone)));
+ SALOMEDS::SObject_var aZoneSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myZone)));
ASSERT(!CORBA::is_nil(aZoneSO));
- SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+ SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
aStudyBuilder->NewCommand();
MESSAGE("AssociateIterHypo : nomHypo = " << nomHypo << " nomIter = " << nomIter);
// Verification de l'existence de l'hypothese
- HOMARD::HOMARD_Hypothesis_var myHypo = myContextMap[GetCurrentStudyID()]._mesHypotheses[nomHypo];
+ HOMARD::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypo];
ASSERT(!CORBA::is_nil(myHypo));
- SALOMEDS::SObject_var aHypoSO = SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myHypo)));
+ SALOMEDS::SObject_var aHypoSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myHypo)));
ASSERT(!CORBA::is_nil(aHypoSO));
// Verification de l'existence de l'iteration
- HOMARD::HOMARD_Iteration_var myIteration = myContextMap[GetCurrentStudyID()]._mesIterations[nomIter];
+ HOMARD::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[nomIter];
ASSERT(!CORBA::is_nil(myIteration));
- SALOMEDS::SObject_var aIterSO = SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myIteration)));
+ SALOMEDS::SObject_var aIterSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myIteration)));
ASSERT(!CORBA::is_nil(aIterSO));
// Gestion de l'arbre d'etudes
- SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+ SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
aStudyBuilder->NewCommand();
SALOMEDS::SObject_var aSubSO = aStudyBuilder->NewObject(aIterSO);
aStudyBuilder->Addreference(aSubSO, aHypoSO);
myIteration->SetHypoName(nomHypo);
myHypo->LinkIteration(nomIter);
- // On stocke les noms des champ a interpoler pour le futur controle de la donnee des pas de temps
+ // On stocke les noms des champ a interpoler pour le futur controle de la donnée des pas de temps
myIteration->SupprFieldInterps() ;
HOMARD::listeFieldInterpsHypo* ListField = myHypo->GetFieldInterps();
int numberOfFieldsx2 = ListField->length();
{
MESSAGE ( "DissociateHypoZone : ZoneName= " << ZoneName << ", nomHypo = " << nomHypothesis);
- HOMARD::HOMARD_Hypothesis_var myHypo = myContextMap[GetCurrentStudyID()]._mesHypotheses[nomHypothesis];
+ HOMARD::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypothesis];
ASSERT(!CORBA::is_nil(myHypo));
- SALOMEDS::SObject_var aHypoSO = SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myHypo)));
+ SALOMEDS::SObject_var aHypoSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myHypo)));
ASSERT(!CORBA::is_nil(aHypoSO));
- HOMARD::HOMARD_Zone_var myZone = myContextMap[GetCurrentStudyID()]._mesZones[ZoneName];
+ HOMARD::HOMARD_Zone_var myZone = myStudyContext._mesZones[ZoneName];
ASSERT(!CORBA::is_nil(myZone));
- SALOMEDS::SObject_var aZoneSO = SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myZone)));
+ SALOMEDS::SObject_var aZoneSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myZone)));
ASSERT(!CORBA::is_nil(aZoneSO));
- SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+ SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
- SALOMEDS::ChildIterator_var it = myCurrentStudy->NewChildIterator(aHypoSO);
+ SALOMEDS::ChildIterator_var it = myStudy->NewChildIterator(aHypoSO);
for (; it->More(); it->Next())
{
SALOMEDS::SObject_var aHypObj = it->Value();
IsValidStudy () ;
HOMARD::listeBoundarys_var ret = new HOMARD::listeBoundarys;
- ret->length(myContextMap[GetCurrentStudyID()]._mesBoundarys.size());
+ ret->length(myStudyContext._mesBoundarys.size());
std::map<std::string, HOMARD::HOMARD_Boundary_var>::const_iterator it;
int i = 0;
- for (it = myContextMap[GetCurrentStudyID()]._mesBoundarys.begin();
- it != myContextMap[GetCurrentStudyID()]._mesBoundarys.end(); it++)
+ for (it = myStudyContext._mesBoundarys.begin();
+ it != myStudyContext._mesBoundarys.end(); it++)
{
ret[i++] = CORBA::string_dup((*it).first.c_str());
}
IsValidStudy () ;
HOMARD::listeCases_var ret = new HOMARD::listeCases;
- ret->length(myContextMap[GetCurrentStudyID()]._mesCas.size());
+ ret->length(myStudyContext._mesCas.size());
std::map<std::string, HOMARD::HOMARD_Cas_var>::const_iterator it;
int i = 0;
- for (it = myContextMap[GetCurrentStudyID()]._mesCas.begin();
- it != myContextMap[GetCurrentStudyID()]._mesCas.end(); it++)
+ for (it = myStudyContext._mesCas.begin();
+ it != myStudyContext._mesCas.end(); it++)
{
ret[i++] = CORBA::string_dup((*it).first.c_str());
}
IsValidStudy () ;
HOMARD::listeHypotheses_var ret = new HOMARD::listeHypotheses;
- ret->length(myContextMap[GetCurrentStudyID()]._mesHypotheses.size());
+ ret->length(myStudyContext._mesHypotheses.size());
std::map<std::string, HOMARD::HOMARD_Hypothesis_var>::const_iterator it;
int i = 0;
- for (it = myContextMap[GetCurrentStudyID()]._mesHypotheses.begin();
- it != myContextMap[GetCurrentStudyID()]._mesHypotheses.end(); it++)
+ for (it = myStudyContext._mesHypotheses.begin();
+ it != myStudyContext._mesHypotheses.end(); it++)
{
ret[i++] = CORBA::string_dup((*it).first.c_str());
}
IsValidStudy () ;
HOMARD::listeIterations_var ret = new HOMARD::listeIterations;
- ret->length(myContextMap[GetCurrentStudyID()]._mesIterations.size());
+ ret->length(myStudyContext._mesIterations.size());
std::map<std::string, HOMARD::HOMARD_Iteration_var>::const_iterator it;
int i = 0;
- for (it = myContextMap[GetCurrentStudyID()]._mesIterations.begin();
- it != myContextMap[GetCurrentStudyID()]._mesIterations.end(); it++)
+ for (it = myStudyContext._mesIterations.begin();
+ it != myStudyContext._mesIterations.end(); it++)
{
ret[i++] = CORBA::string_dup((*it).first.c_str());
}
IsValidStudy () ;
HOMARD::listeYACSs_var ret = new HOMARD::listeYACSs;
- ret->length(myContextMap[GetCurrentStudyID()]._mesYACSs.size());
+ ret->length(myStudyContext._mesYACSs.size());
std::map<std::string, HOMARD::HOMARD_YACS_var>::const_iterator it;
int i = 0;
- for (it = myContextMap[GetCurrentStudyID()]._mesYACSs.begin();
- it != myContextMap[GetCurrentStudyID()]._mesYACSs.end(); it++)
+ for (it = myStudyContext._mesYACSs.begin();
+ it != myStudyContext._mesYACSs.end(); it++)
{
ret[i++] = CORBA::string_dup((*it).first.c_str());
}
IsValidStudy () ;
HOMARD::listeZones_var ret = new HOMARD::listeZones;
- ret->length(myContextMap[GetCurrentStudyID()]._mesZones.size());
+ ret->length(myStudyContext._mesZones.size());
std::map<std::string, HOMARD::HOMARD_Zone_var>::const_iterator it;
int i = 0;
- for (it = myContextMap[GetCurrentStudyID()]._mesZones.begin();
- it != myContextMap[GetCurrentStudyID()]._mesZones.end(); it++)
+ for (it = myStudyContext._mesZones.begin();
+ it != myStudyContext._mesZones.end(); it++)
{
ret[i++] = CORBA::string_dup((*it).first.c_str());
}
//=============================================================================
HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::GetBoundary(const char* nomBoundary)
{
- HOMARD::HOMARD_Boundary_var myBoundary = myContextMap[GetCurrentStudyID()]._mesBoundarys[nomBoundary];
+ HOMARD::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[nomBoundary];
ASSERT(!CORBA::is_nil(myBoundary));
return HOMARD::HOMARD_Boundary::_duplicate(myBoundary);
}
//=============================================================================
HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::GetCase(const char* nomCas)
{
- HOMARD::HOMARD_Cas_var myCase = myContextMap[GetCurrentStudyID()]._mesCas[nomCas];
+ HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas];
ASSERT(!CORBA::is_nil(myCase));
return HOMARD::HOMARD_Cas::_duplicate(myCase);
}
//=============================================================================
HOMARD::HOMARD_Hypothesis_ptr HOMARD_Gen_i::GetHypothesis(const char* nomHypothesis)
{
- HOMARD::HOMARD_Hypothesis_var myHypothesis = myContextMap[GetCurrentStudyID()]._mesHypotheses[nomHypothesis];
+ HOMARD::HOMARD_Hypothesis_var myHypothesis = myStudyContext._mesHypotheses[nomHypothesis];
ASSERT(!CORBA::is_nil(myHypothesis));
return HOMARD::HOMARD_Hypothesis::_duplicate(myHypothesis);
}
//=============================================================================
HOMARD::HOMARD_Iteration_ptr HOMARD_Gen_i::GetIteration(const char* NomIterationation)
{
- HOMARD::HOMARD_Iteration_var myIteration = myContextMap[GetCurrentStudyID()]._mesIterations[NomIterationation];
+ HOMARD::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[NomIterationation];
ASSERT(!CORBA::is_nil(myIteration));
return HOMARD::HOMARD_Iteration::_duplicate(myIteration);
}
//=============================================================================
HOMARD::HOMARD_YACS_ptr HOMARD_Gen_i::GetYACS(const char* nomYACS)
{
- HOMARD::HOMARD_YACS_var myYACS = myContextMap[GetCurrentStudyID()]._mesYACSs[nomYACS];
+ HOMARD::HOMARD_YACS_var myYACS = myStudyContext._mesYACSs[nomYACS];
ASSERT(!CORBA::is_nil(myYACS));
return HOMARD::HOMARD_YACS::_duplicate(myYACS);
}
//=============================================================================
HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::GetZone(const char* ZoneName)
{
- HOMARD::HOMARD_Zone_var myZone = myContextMap[GetCurrentStudyID()]._mesZones[ZoneName];
+ HOMARD::HOMARD_Zone_var myZone = myStudyContext._mesZones[ZoneName];
ASSERT(!CORBA::is_nil(myZone));
return HOMARD::HOMARD_Zone::_duplicate(myZone);
}
//=============================================================================
void HOMARD_Gen_i::MeshInfo(const char* nomCas, const char* MeshName, const char* MeshFile, const char* DirName, CORBA::Long Qual, CORBA::Long Diam, CORBA::Long Conn, CORBA::Long Tail, CORBA::Long Inte)
{
- INFOS ( "MeshInfo : nomCas = " << nomCas << ", MeshName = " << MeshName << ", MeshFile = " << MeshFile );
- INFOS ( "Qual = " << Qual << ", Diam = " << Diam << ", Conn = " << Conn << ", Tail = " << Tail << ", Inte = " << Inte );
+ MESSAGE ( "MeshInfo : nomCas = " << nomCas << ", MeshName = " << MeshName << ", MeshFile = " << MeshFile );
+ MESSAGE ( "Qual = " << Qual << ", Diam = " << Diam << ", Conn = " << Conn << ", Tail = " << Tail << ", Inte = " << Inte );
IsValidStudy () ;
// Creation du cas
//=============================================================================
HOMARD::HOMARD_Iteration_ptr HOMARD_Gen_i::LastIteration(const char* nomCas)
{
- HOMARD::HOMARD_Cas_var myCase = myContextMap[GetCurrentStudyID()]._mesCas[nomCas];
+ HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas];
ASSERT(!CORBA::is_nil(myCase));
//
HOMARD::HOMARD_Iteration_var myIteration = myCase->LastIteration();
HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCaseFromIteration(const char* nomCas, const char* DirNameStart)
//
// nomCas : nom du cas a creer
-// DirNameStart : nom du repertoire contenant l'iteration de reprise
+// DirNameStart : nom du répertoire contenant l'iteration de reprise
//
{
- INFOS ( "CreateCaseFromIteration : nomCas = " << nomCas << ", DirNameStart = " << DirNameStart );
+ MESSAGE ( "CreateCaseFromIteration : nomCas = " << nomCas << ", DirNameStart = " << DirNameStart );
std::string nomDirWork = getenv("PWD") ;
int codret ;
// A. Decodage du point de reprise
- // A.1. Controle du repertoire de depart de l'iteration
+ // A.1. Controle du répertoire de depart de l'iteration
codret = CHDIR(DirNameStart) ;
if ( codret != 0 )
{
throw SALOME::SALOME_Exception(es);
return 0;
};
- // A.2. Reperage des fichiers du repertoire de reprise
+ // A.2. Reperage des fichiers du répertoire de reprise
std::string file_configuration = "" ;
std::string file_maillage_homard = "" ;
int bilan ;
// B. Lecture du fichier de configuration
// ATTENTION : on doit veiller a la coherence entre HomardDriver et CreateCaseFromIteration
int NumeIter ;
+ int TypeExt = 0 ;
int TypeConf = 0 ;
int Pyram = 0 ;
char* MeshName ;
// D. Parametrages lus dans le fichier de configuration
myCase->SetConfType (TypeConf) ;
+ myCase->SetExtType (TypeExt) ;
myCase->SetPyram (Pyram) ;
// E. Copie du fichier de maillage homard
- // E.1. Repertoire associe au cas
+ // E.1. Répertoire associe au cas
char* nomDirCase = myCase->GetDirName() ;
- // E.2. Repertoire associe a l'iteration de ce cas
+ // E.2. Répertoire associe a l'iteration de ce cas
char* IterName ;
IterName = myCase->GetIter0Name() ;
HOMARD::HOMARD_Iteration_var Iter = GetIteration(IterName) ;
HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCaseFromCaseLastIteration(const char* nomCas, const char* DirNameStart)
//
// nomCas : nom du cas a creer
-// DirNameStart : nom du repertoire du cas contenant l'iteration de reprise
+// DirNameStart : nom du répertoire du cas contenant l'iteration de reprise
//
{
- INFOS ( "CreateCaseFromCaseLastIteration : nomCas = " << nomCas << ", DirNameStart = " << DirNameStart );
+ MESSAGE ( "CreateCaseFromCaseLastIteration : nomCas = " << nomCas << ", DirNameStart = " << DirNameStart );
std::string DirNameStartIter = CreateCase1(DirNameStart, -1) ;
HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCaseFromCaseIteration(const char* nomCas, const char* DirNameStart, CORBA::Long Number)
//
// nomCas : nom du cas a creer
-// DirNameStart : nom du repertoire du cas contenant l'iteration de reprise
+// DirNameStart : nom du répertoire du cas contenant l'iteration de reprise
// Number : numero de l'iteration de depart
//
{
- INFOS ( "CreateCaseFromCaseIteration : nomCas = " << nomCas << ", DirNameStart = " << DirNameStart << ", Number = " << Number );
+ MESSAGE ( "CreateCaseFromCaseIteration : nomCas = " << nomCas << ", DirNameStart = " << DirNameStart << ", Number = " << Number );
if ( Number < 0 )
{
SALOME::ExceptionStruct es;
//=============================================================================
std::string HOMARD_Gen_i::CreateCase1(const char* DirNameStart, CORBA::Long Number)
//
-// Retourne le nom du repertoire ou se trouve l'iteration voulue.
-// DirNameStart : nom du repertoire du cas contenant l'iteration de reprise
+// Retourne le nom du répertoire ou se trouve l'iteration voulue.
+// DirNameStart : nom du répertoire du cas contenant l'iteration de reprise
// Number : numero de l'iteration de depart ou -1 si on cherche la derniere
//
{
int codret ;
int NumeIterMax = -1 ;
- // A.1. Controle du repertoire de depart du cas
+ // A.1. Controle du répertoire de depart du cas
codret = CHDIR(DirNameStart) ;
if ( codret != 0 )
{
throw SALOME::SALOME_Exception(es);
return 0;
};
- // A.2. Reperage des sous-repertoire du repertoire de reprise
+ // A.2. Reperage des sous-répertoire du répertoire de reprise
bool existe = false ;
#ifndef WIN32
DIR *dp;
{
if ( CHDIR(DirName_1.c_str()) == 0 )
{
-// On cherche le fichier de configuration dans ce sous-repertoire
+// On cherche le fichier de configuration dans ce sous-répertoire
codret = CHDIR(DirNameStart);
#ifndef WIN32
DIR *dp_1;
IsValidStudy () ;
// A.2. Controle du nom :
- if ((myContextMap[GetCurrentStudyID()]._mesCas).find(nomCas)!=(myContextMap[GetCurrentStudyID()]._mesCas).end())
+ if ((myStudyContext._mesCas).find(nomCas)!=(myStudyContext._mesCas).end())
{
SALOME::ExceptionStruct es;
es.type = SALOME::BAD_PARAM;
HOMARD::HOMARD_Cas_var myCase = newCase();
myCase->SetName(nomCas);
SALOMEDS::SObject_var aSO;
- SALOMEDS::SObject_var aResultSO=PublishInStudy(myCurrentStudy, aSO, myCase, nomCas);
- myContextMap[GetCurrentStudyID()]._mesCas[nomCas] = myCase;
+ SALOMEDS::SObject_var aResultSO=PublishInStudy(aSO, myCase, nomCas);
+ myStudyContext._mesCas[nomCas] = myCase;
// C. Caracteristiques du maillage
if ( existeMeshFile != 0 )
{
- // Les valeurs extremes des coordonnees
-// MESSAGE ( "CreateCase0 : Les valeurs extremes des coordonnees" );
+ // Les valeurs extremes des coordonnées
+// MESSAGE ( "CreateCase0 : Les valeurs extremes des coordonnées" );
std::vector<double> LesExtremes =GetBoundingBoxInMedFile(MeshFile) ;
HOMARD::extrema_var aSeq = new HOMARD::extrema() ;
- if (LesExtremes.size()!=10) { return false; }
+ if (LesExtremes.size()!=10) { return 0; }
aSeq->length(10) ;
for (int i =0 ; i< LesExtremes.size() ; i++)
aSeq[i]=LesExtremes[i] ;
// Si ce nom d'iteration existe deja, on incremente avec 0, 1, 2, etc.
int monNum = 0;
std::string NomIteration = std::string(MeshName) ;
- while ( (myContextMap[GetCurrentStudyID()]._mesIterations).find(NomIteration) != (myContextMap[GetCurrentStudyID()]._mesIterations.end()) )
+ while ( (myStudyContext._mesIterations).find(NomIteration) != (myStudyContext._mesIterations.end()) )
{
std::ostringstream nom;
nom << MeshName << monNum;
// D.2. Creation de l'iteration
HOMARD::HOMARD_Iteration_var anIter = newIteration();
- myContextMap[GetCurrentStudyID()]._mesIterations[NomIteration] = anIter;
+ myStudyContext._mesIterations[NomIteration] = anIter;
anIter->SetName(NomIteration.c_str());
AssociateCaseIter (nomCas, NomIteration.c_str(), "IterationHomard");
//=============================================================================
HOMARD::HOMARD_Hypothesis_ptr HOMARD_Gen_i::CreateHypothesis(const char* nomHypothesis)
{
- INFOS ( "CreateHypothesis : nomHypothesis = " << nomHypothesis );
+ MESSAGE ( "CreateHypothesis : nomHypothesis = " << nomHypothesis );
IsValidStudy () ;
// A. Controle du nom :
- if ((myContextMap[GetCurrentStudyID()]._mesHypotheses).find(nomHypothesis) != (myContextMap[GetCurrentStudyID()]._mesHypotheses).end())
+ if ((myStudyContext._mesHypotheses).find(nomHypothesis) != (myStudyContext._mesHypotheses).end())
{
SALOME::ExceptionStruct es;
es.type = SALOME::BAD_PARAM;
myHypothesis->SetName(nomHypothesis);
// C. Enregistrement
- myContextMap[GetCurrentStudyID()]._mesHypotheses[nomHypothesis] = myHypothesis;
+ myStudyContext._mesHypotheses[nomHypothesis] = myHypothesis;
SALOMEDS::SObject_var aSO;
- SALOMEDS::SObject_var aResultSO=PublishInStudy(myCurrentStudy, aSO, myHypothesis, nomHypothesis);
+ SALOMEDS::SObject_var aResultSO=PublishInStudy(aSO, myHypothesis, nomHypothesis);
// D. Valeurs par defaut des options avancees
myHypothesis->SetNivMax(-1);
HOMARD::HOMARD_Iteration_ptr HOMARD_Gen_i::CreateIteration(const char* NomIteration, const char* nomIterParent)
//=============================================================================
{
- INFOS ("CreateIteration : NomIteration = " << NomIteration << ", nomIterParent = " << nomIterParent);
+ MESSAGE ("CreateIteration : NomIteration = " << NomIteration << ", nomIterParent = " << nomIterParent);
IsValidStudy () ;
- HOMARD::HOMARD_Iteration_var myIterationParent = myContextMap[GetCurrentStudyID()]._mesIterations[nomIterParent];
+ HOMARD::HOMARD_Iteration_var myIterationParent = myStudyContext._mesIterations[nomIterParent];
if (CORBA::is_nil(myIterationParent))
{
SALOME::ExceptionStruct es;
const char* nomCas = myIterationParent->GetCaseName();
MESSAGE ("CreateIteration : nomCas = " << nomCas);
- HOMARD::HOMARD_Cas_var myCase = myContextMap[GetCurrentStudyID()]._mesCas[nomCas];
+ HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas];
if (CORBA::is_nil(myCase))
{
SALOME::ExceptionStruct es;
const char* nomDirCase = myCase->GetDirName();
// Controle du nom :
- if ((myContextMap[GetCurrentStudyID()]._mesIterations).find(NomIteration)!=(myContextMap[GetCurrentStudyID()]._mesIterations).end())
+ if ((myStudyContext._mesIterations).find(NomIteration)!=(myStudyContext._mesIterations).end())
{
SALOME::ExceptionStruct es;
es.type = SALOME::BAD_PARAM;
throw SALOME::SALOME_Exception(es);
return 0;
};
- myContextMap[GetCurrentStudyID()]._mesIterations[std::string(NomIteration)] = myIteration;
+ myStudyContext._mesIterations[std::string(NomIteration)] = myIteration;
// Nom de l'iteration et du maillage
myIteration->SetName(NomIteration);
myIteration->SetMeshName(NomIteration);
myIteration->SetNumber(numero);
// Nombre d'iterations deja connues pour le cas, permettant
-// la creation d'un sous-repertoire unique
+// la creation d'un sous-répertoire unique
int nbitercase = myCase->GetNumberofIter();
char* nomDirIter = CreateDirNameIter(nomDirCase, nbitercase );
myIteration->SetDirNameLoc(nomDirIter);
myIterationParent->LinkNextIteration(NomIteration);
myIteration->SetIterParentName(nomIterParent);
// Gestion de l'arbre d'etudes
- SALOMEDS::SObject_var aIterSOParent = SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myIterationParent)));
- SALOMEDS::SObject_var aIterSO = SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myIteration)));
- SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+ SALOMEDS::SObject_var aIterSOParent = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myIterationParent)));
+ SALOMEDS::SObject_var aIterSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myIteration)));
+ SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
aStudyBuilder->NewCommand();
SALOMEDS::SObject_var aSubSO = aStudyBuilder->NewObject(aIterSO);
aStudyBuilder->Addreference(aSubSO, aIterSOParent);
IsValidStudy () ;
// Controle du nom :
- if ((myContextMap[GetCurrentStudyID()]._mesBoundarys).find(BoundaryName)!=(myContextMap[GetCurrentStudyID()]._mesBoundarys).end())
+ if ((myStudyContext._mesBoundarys).find(BoundaryName)!=(myStudyContext._mesBoundarys).end())
{
MESSAGE ("CreateBoundary : la frontiere " << BoundaryName << " existe deja");
SALOME::ExceptionStruct es;
myBoundary->SetName(BoundaryName);
myBoundary->SetType(BoundaryType);
- myContextMap[GetCurrentStudyID()]._mesBoundarys[BoundaryName] = myBoundary;
+ myStudyContext._mesBoundarys[BoundaryName] = myBoundary;
SALOMEDS::SObject_var aSO;
- SALOMEDS::SObject_var aResultSO=PublishInStudy(myCurrentStudy, aSO, myBoundary, BoundaryName);
+ SALOMEDS::SObject_var aResultSO=PublishInStudy(aSO, myBoundary, BoundaryName);
+
+ return HOMARD::HOMARD_Boundary::_duplicate(myBoundary);
+}
+//=============================================================================
+HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::CreateBoundaryCAO(const char* BoundaryName, const char* CAOFile)
+{
+ MESSAGE ("CreateBoundaryCAO : BoundaryName = " << BoundaryName << ", CAOFile = " << CAOFile );
+ HOMARD::HOMARD_Boundary_var myBoundary = CreateBoundary(BoundaryName, -1);
+ myBoundary->SetDataFile( CAOFile ) ;
return HOMARD::HOMARD_Boundary::_duplicate(myBoundary);
}
//=============================================================================
HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::CreateBoundaryDi(const char* BoundaryName, const char* MeshName, const char* MeshFile)
{
- INFOS ("CreateBoundaryDi : BoundaryName = " << BoundaryName << ", MeshName = " << MeshName );
+ MESSAGE ("CreateBoundaryDi : BoundaryName = " << BoundaryName << ", MeshName = " << MeshName << ", MeshFile = " << MeshFile );
HOMARD::HOMARD_Boundary_var myBoundary = CreateBoundary(BoundaryName, 0);
- myBoundary->SetMeshFile( MeshFile ) ;
+ myBoundary->SetDataFile( MeshFile ) ;
myBoundary->SetMeshName( MeshName ) ;
return HOMARD::HOMARD_Boundary::_duplicate(myBoundary);
CORBA::Double Xaxe, CORBA::Double Yaxe, CORBA::Double Zaxe,
CORBA::Double Rayon)
{
- INFOS ("CreateBoundaryCylinder : BoundaryName = " << BoundaryName ) ;
+ MESSAGE ("CreateBoundaryCylinder : BoundaryName = " << BoundaryName ) ;
//
SALOME::ExceptionStruct es;
int error = 0 ;
CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre,
CORBA::Double Rayon)
{
- INFOS ("CreateBoundarySphere : BoundaryName = " << BoundaryName ) ;
+ MESSAGE ("CreateBoundarySphere : BoundaryName = " << BoundaryName ) ;
//
SALOME::ExceptionStruct es;
int error = 0 ;
CORBA::Double Xaxe, CORBA::Double Yaxe, CORBA::Double Zaxe, CORBA::Double Angle,
CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre)
{
- INFOS ("CreateBoundaryConeA : BoundaryName = " << BoundaryName ) ;
+ MESSAGE ("CreateBoundaryConeA : BoundaryName = " << BoundaryName ) ;
//
SALOME::ExceptionStruct es;
int error = 0 ;
CORBA::Double Xcentre1, CORBA::Double Ycentre1, CORBA::Double Zcentre1, CORBA::Double Rayon1,
CORBA::Double Xcentre2, CORBA::Double Ycentre2, CORBA::Double Zcentre2, CORBA::Double Rayon2)
{
- INFOS ("CreateBoundaryConeR : BoundaryName = " << BoundaryName ) ;
+ MESSAGE ("CreateBoundaryConeR : BoundaryName = " << BoundaryName ) ;
//
SALOME::ExceptionStruct es;
int error = 0 ;
CORBA::Double Xaxe, CORBA::Double Yaxe, CORBA::Double Zaxe,
CORBA::Double RayonRev, CORBA::Double RayonPri)
{
- INFOS ("CreateBoundaryTorus : BoundaryName = " << BoundaryName ) ;
+ MESSAGE ("CreateBoundaryTorus : BoundaryName = " << BoundaryName ) ;
//
SALOME::ExceptionStruct es;
int error = 0 ;
IsValidStudy () ;
// Controle du nom :
- if ((myContextMap[GetCurrentStudyID()]._mesZones).find(ZoneName)!=(myContextMap[GetCurrentStudyID()]._mesZones).end())
+ if ((myStudyContext._mesZones).find(ZoneName)!=(myStudyContext._mesZones).end())
{
SALOME::ExceptionStruct es;
es.type = SALOME::BAD_PARAM;
myZone->SetName(ZoneName);
myZone->SetType(ZoneType);
- myContextMap[GetCurrentStudyID()]._mesZones[ZoneName] = myZone;
+ myStudyContext._mesZones[ZoneName] = myZone;
SALOMEDS::SObject_var aSO;
- SALOMEDS::SObject_var aResultSO=PublishInStudy(myCurrentStudy, aSO, myZone, ZoneName);
+ SALOMEDS::SObject_var aResultSO=PublishInStudy(aSO, myZone, ZoneName);
return HOMARD::HOMARD_Zone::_duplicate(myZone);
}
CORBA::Double Ymini, CORBA::Double Ymaxi,
CORBA::Double Zmini, CORBA::Double Zmaxi)
{
- INFOS ("CreateZoneBox : ZoneName = " << ZoneName ) ;
+ MESSAGE ("CreateZoneBox : ZoneName = " << ZoneName ) ;
//
SALOME::ExceptionStruct es;
int error = 0 ;
HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZoneSphere(const char* ZoneName,
CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre, CORBA::Double Rayon)
{
- INFOS ("CreateZoneSphere : ZoneName = " << ZoneName ) ;
+ MESSAGE ("CreateZoneSphere : ZoneName = " << ZoneName ) ;
//
SALOME::ExceptionStruct es;
int error = 0 ;
CORBA::Double Xaxe, CORBA::Double Yaxe, CORBA::Double Zaxe,
CORBA::Double Rayon, CORBA::Double Haut)
{
- INFOS ("CreateZoneCylinder : ZoneName = " << ZoneName ) ;
+ MESSAGE ("CreateZoneCylinder : ZoneName = " << ZoneName ) ;
//
SALOME::ExceptionStruct es;
int error = 0 ;
CORBA::Double Xaxe, CORBA::Double Yaxe, CORBA::Double Zaxe,
CORBA::Double Rayon, CORBA::Double Haut, CORBA::Double Rayonint)
{
- INFOS ("CreateZonePipe : ZoneName = " << ZoneName ) ;
+ MESSAGE ("CreateZonePipe : ZoneName = " << ZoneName ) ;
//
SALOME::ExceptionStruct es;
int error = 0 ;
CORBA::Double Vmini, CORBA::Double Vmaxi,
CORBA::Long Orient)
{
- INFOS ("CreateZoneBox2D : ZoneName = " << ZoneName ) ;
+ MESSAGE ("CreateZoneBox2D : ZoneName = " << ZoneName ) ;
// MESSAGE ("Umini = " << Umini << ", Umaxi =" << Umaxi ) ;
// MESSAGE ("Vmini = " << Vmini << ", Vmaxi =" << Vmaxi ) ;
// MESSAGE ("Orient = " << Orient ) ;
CORBA::Double Rayon,
CORBA::Long Orient)
{
- INFOS ("CreateZoneDisk : ZoneName = " << ZoneName ) ;
+ MESSAGE ("CreateZoneDisk : ZoneName = " << ZoneName ) ;
//
SALOME::ExceptionStruct es;
int error = 0 ;
CORBA::Double Rayon, CORBA::Double Rayonint,
CORBA::Long Orient)
{
- INFOS ("CreateZoneDiskWithHole : ZoneName = " << ZoneName ) ;
+ MESSAGE ("CreateZoneDiskWithHole : ZoneName = " << ZoneName ) ;
//
SALOME::ExceptionStruct es;
int error = 0 ;
//=============================================================================
//=============================================================================
// Traitement d'une iteration
-// etatMenage = 1 : destruction du repertoire d'execution
+// etatMenage = 1 : destruction du répertoire d'execution
// modeHOMARD = 1 : adaptation
// != 1 : information avec les options modeHOMARD
// Option1 >0 : appel depuis python
int codret = 0;
// A.1. L'objet iteration
- HOMARD::HOMARD_Iteration_var myIteration = myContextMap[GetCurrentStudyID()]._mesIterations[NomIteration];
+ HOMARD::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[NomIteration];
ASSERT(!CORBA::is_nil(myIteration));
// A.2. Controle de la possibilite d'agir
// A.4. Le cas
const char* nomCas = myIteration->GetCaseName();
- HOMARD::HOMARD_Cas_var myCase = myContextMap[GetCurrentStudyID()]._mesCas[nomCas];
+ HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas];
ASSERT(!CORBA::is_nil(myCase));
- // B. Les repertoires
- // B.1. Le repertoire courant
+ // B. Les répertoires
+ // B.1. Le répertoire courant
std::string nomDirWork = getenv("PWD") ;
- // B.2. Le sous-repertoire de l'iteration a traiter
+ // B.2. Le sous-répertoire de l'iteration a traiter
char* DirCompute = ComputeDirManagement(myCase, myIteration, etatMenage);
MESSAGE( ". DirCompute = " << DirCompute );
FileInfo += "." + siterp1 + ".bilan" ;
myIteration->SetFileInfo(FileInfo.c_str());
- // D. On passe dans le repertoire de l'iteration a calculer
+ // D. On passe dans le répertoire de l'iteration a calculer
MESSAGE ( ". On passe dans DirCompute = " << DirCompute );
CHDIR(DirCompute);
- // E. Les donnees de l'execution HOMARD
+ // E. Les données de l'exécution HOMARD
// E.1. L'objet du texte du fichier de configuration
HomardDriver* myDriver = new HomardDriver(siter, siterp1);
myDriver->TexteInit(DirCompute, LogFile, _Langue);
const char* MeshFile = myIteration->GetMeshFile();
MESSAGE ( ". MeshFile = " << MeshFile );
- // E.3. Les donnees du traitement HOMARD
+ // E.3. Les données du traitement HOMARD
int iaux ;
if ( modeHOMARD == 1 )
{
}
// E.4. Ajout des informations liees a l'eventuel suivi de frontiere
- DriverTexteBoundary(myCase, myDriver) ;
+ int BoundaryOption = DriverTexteBoundary(myCase, myDriver) ;
// E.5. Ecriture du texte dans le fichier
MESSAGE ( ". Ecriture du texte dans le fichier de configuration ; codret = "<<codret );
// G. Execution
//
- int codretexec = 12 ;
+ int codretexec = 1789 ;
if (codret == 0)
{
codretexec = myDriver->ExecuteHomard(Option1);
}
}
- // I. Menage et retour dans le repertoire du cas
+ // I. Menage et retour dans le répertoire du cas
if (codret == 0)
{
delete myDriver;
CHDIR(nomDirWork.c_str());
}
+ // J. Suivi de la frontière CAO
+// std::cout << "- codret : " << codret << std::endl;
+// std::cout << "- modeHOMARD : " << modeHOMARD << std::endl;
+// std::cout << "- BoundaryOption : " << BoundaryOption << std::endl;
+// std::cout << "- codretexec : " << codretexec << std::endl;
+ if (codret == 0)
+ {
+ if ( ( modeHOMARD == 1 ) && ( BoundaryOption % 5 == 0 ) && (codretexec == 0) )
+ {
+ MESSAGE ( "Suivi de frontière CAO" );
+ codret = ComputeCAO(myCase, myIteration, Option1, Option2) ;
+ }
+ }
+
return codretexec ;
}
//=============================================================================
-// Calcul d'une iteration : partie specifique a l'adaptation
+// Calcul d'une iteration : partie spécifique à l'adaptation
//=============================================================================
CORBA::Long HOMARD_Gen_i::ComputeAdap(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOMARD_Iteration_var myIteration, CORBA::Long etatMenage, HomardDriver* myDriver, CORBA::Long Option1, CORBA::Long Option2)
{
- MESSAGE ( "ComputeAdap" );
+ MESSAGE ( "ComputeAdap avec Option1 = " << Option1 << ", Option2 = " << Option2 );
// A. Prealable
// A.1. Bases
throw SALOME::SALOME_Exception(es);
return 2;
};
- HOMARD::HOMARD_Hypothesis_var myHypo = myContextMap[GetCurrentStudyID()]._mesHypotheses[nomHypo];
+ HOMARD::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypo];
ASSERT(!CORBA::is_nil(myHypo));
// B. L'iteration parent
const char* nomIterationParent = myIteration->GetIterParentName();
- HOMARD::HOMARD_Iteration_var myIterationParent = myContextMap[GetCurrentStudyID()]._mesIterations[nomIterationParent];
+ HOMARD::HOMARD_Iteration_var myIterationParent = myStudyContext._mesIterations[nomIterationParent];
ASSERT(!CORBA::is_nil(myIterationParent));
// Si l'iteration parent n'est pas calculee, on le fait (recursivite amont)
if ( myIterationParent->GetState() == 1 )
}
};
- // C. Le sous-repertoire de l'iteration precedente
+ // C. Le sous-répertoire de l'iteration precedente
char* DirComputePa = ComputeDirPaManagement(myCase, myIteration);
MESSAGE( ". DirComputePa = " << DirComputePa );
- // D. Les donnees de l'adaptation HOMARD
+ // D. Les données de l'adaptation HOMARD
// D.1. Le type de conformite
int ConfType = myCase->GetConfType();
MESSAGE ( ". ConfType = " << ConfType );
- // D.2. Le maillage de depart
+ // D.1. Le type externe
+ int ExtType = myCase->GetExtType();
+ MESSAGE ( ". ExtType = " << ExtType );
+
+ // D.3. Le maillage de depart
const char* NomMeshParent = myIterationParent->GetMeshName();
MESSAGE ( ". NomMeshParent = " << NomMeshParent );
const char* MeshFileParent = myIterationParent->GetMeshFile();
MESSAGE ( ". MeshFileParent = " << MeshFileParent );
- // D.3. Le maillage associe a l'iteration
+ // D.4. Le maillage associe a l'iteration
const char* MeshFile = myIteration->GetMeshFile();
MESSAGE ( ". MeshFile = " << MeshFile );
FILE *file = fopen(MeshFile,"r");
}
}
- // D.4. Les types de raffinement et de deraffinement
+ // D.5. Les types de raffinement et de deraffinement
// Les appels corba sont lourds, il vaut mieux les grouper
HOMARD::listeTypes* ListTypes = myHypo->GetAdapRefinUnRef();
ASSERT(ListTypes->length() == 3);
// E. Texte du fichier de configuration
// E.1. Incontournables du texte
- myDriver->TexteAdap();
+ myDriver->TexteAdap(ExtType);
int iaux = 0 ;
myDriver->TexteMaillageHOMARD( DirComputePa, siter, iaux ) ;
myDriver->TexteMaillage(NomMeshParent, MeshFileParent, 0);
return codret ;
}
//=============================================================================
-// Creation d'un nom de sous-repertoire pour l'iteration au sein d'un repertoire parent
-// nomrep : nom du repertoire parent
-// num : le nom du sous-repertoire est sous la forme 'In', n est >= num
+// Calcul d'une iteration : partie spécifique au suivi de frontière CAO
+//=============================================================================
+CORBA::Long HOMARD_Gen_i::ComputeCAO(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOMARD_Iteration_var myIteration, CORBA::Long Option1, CORBA::Long Option2)
+{
+ MESSAGE ( "ComputeCAO avec Option1 = " << Option1 << ", Option2 = " << Option2 );
+
+ // A. Prealable
+ // A.1. Bases
+ int codret = 0;
+ // A.2. Le sous-répertoire de l'iteration en cours de traitement
+ char* DirCompute = myIteration->GetDirName();
+ // A.3. Le maillage résultat de l'iteration en cours de traitement
+ char* MeshFile = myIteration->GetMeshFile();
+
+ // B. Les données pour FrontTrack
+ // B.1. Le maillage à modifier
+ const std::string theInputMedFile = MeshFile;
+ MESSAGE ( ". theInputMedFile = " << theInputMedFile );
+
+ // B.2. Le maillage après modification : fichier identique
+ const std::string theOutputMedFile = MeshFile ;
+ MESSAGE ( ". theOutputMedFile = " << theInputMedFile );
+
+ // B.3. La liste des fichiers contenant les numéros des noeuds à bouger
+ std::vector< std::string > theInputNodeFiles ;
+ MESSAGE ( ". DirCompute = " << DirCompute );
+ int bilan ;
+ int icpt = 0 ;
+#ifndef WIN32
+ DIR *dp;
+ struct dirent *dirp;
+ dp = opendir(DirCompute);
+ while ( (dirp = readdir(dp)) != NULL )
+ {
+ std::string file_name(dirp->d_name);
+ bilan = file_name.find("fr") ;
+ if ( bilan != string::npos )
+ {
+ std::stringstream filename_total ;
+ filename_total << DirCompute << "/" << file_name ;
+ theInputNodeFiles.push_back(filename_total.str()) ;
+ icpt += 1 ;
+ }
+ }
+#else
+ HANDLE hFind = INVALID_HANDLE_VALUE;
+ WIN32_FIND_DATA ffd;
+ hFind = FindFirstFile(DirNameStart, &ffd);
+ if (INVALID_HANDLE_VALUE != hFind) {
+ while (FindNextFile(hFind, &ffd) != 0) {
+ std::string file_name(ffd.cFileName);
+ bilan = file_name.find("fr") ;
+ if ( bilan != string::npos )
+ {
+ std::stringstream filename_total ;
+ filename_total << DirCompute << "/" << file_name ;
+ theInputNodeFiles.push_back(filename_total.str()) ;
+ icpt += 1 ;
+ }
+ }
+ FindClose(hFind);
+ }
+#endif
+ for ( int i = 0; i < icpt; i++ )
+ { MESSAGE ( ". theInputNodeFiles["<< i << "] = " << theInputNodeFiles[i] ); }
+
+ // B.4. Le fichier de la CAO
+ HOMARD::ListBoundaryGroupType* ListBoundaryGroupType = myCase->GetBoundaryGroup();
+ std::string BoundaryName = std::string((*ListBoundaryGroupType)[0]);
+ MESSAGE ( ". BoundaryName = " << BoundaryName );
+ HOMARD::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[BoundaryName];
+ const std::string theXaoFileName = myBoundary->GetDataFile();
+ MESSAGE ( ". theXaoFileName = " << theXaoFileName );
+
+ // B.5. Parallélisme
+ bool theIsParallel = false;
+
+ // C. Lancement des projections
+ MESSAGE ( ". Lancement des projections" );
+ FrontTrack* myFrontTrack = new FrontTrack();
+ myFrontTrack->track(theInputMedFile, theOutputMedFile, theInputNodeFiles, theXaoFileName, theIsParallel);
+
+ // D. Transfert des coordonnées modifiées dans le fichier historique de HOMARD
+ // On lance une exécution spéciale de HOMARD en attendant de savoir le faire avec MEDCoupling
+ MESSAGE ( ". Transfert des coordonnées" );
+ codret = ComputeCAObis(myIteration, Option1, Option2) ;
+
+ return codret ;
+}
+//=============================================================================
+//=============================================================================
+// Transfert des coordonnées en suivi de frontière CAO
+// Option1 >0 : appel depuis python
+// <0 : appel depuis GUI
+// Option2 : multiple de nombres premiers
+// 1 : aucune option
+// x2 : publication du maillage dans SMESH
+//=============================================================================
+CORBA::Long HOMARD_Gen_i::ComputeCAObis(HOMARD::HOMARD_Iteration_var myIteration, CORBA::Long Option1, CORBA::Long Option2)
+{
+ MESSAGE ( "ComputeCAObis, avec Option1 = " << Option1 << ", Option2 = " << Option2 );
+
+ // A. Prealable
+ int codret = 0;
+
+ // A.1. Controle de la possibilite d'agir
+ // A.1.1. Etat de l'iteration
+ int etat = myIteration->GetState();
+ MESSAGE ( "etat = "<<etat );
+ // A.1.2. L'iteration doit être calculee
+ if ( etat == 1 )
+ {
+ SALOME::ExceptionStruct es;
+ es.type = SALOME::BAD_PARAM;
+ es.text = "This iteration is not computed.";
+ throw SALOME::SALOME_Exception(es);
+ return 1 ;
+ }
+ // A.2. Numero de l'iteration
+ // siterp1 : numero de l'iteration a traiter
+ int NumeIter = myIteration->GetNumber();
+ std::string siterp1 ;
+ std::stringstream saux1 ;
+ saux1 << NumeIter ;
+ siterp1 = saux1.str() ;
+ if (NumeIter < 10) { siterp1 = "0" + siterp1 ; }
+ MESSAGE ( "siterp1 = "<<siterp1 );
+
+ // A.3. Le cas
+ const char* CaseName = myIteration->GetCaseName();
+ HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[CaseName];
+ ASSERT(!CORBA::is_nil(myCase));
+
+ // A.4. Le sous-répertoire de l'iteration a traiter
+ char* DirCompute = myIteration->GetDirName();
+ MESSAGE( ". DirCompute = " << DirCompute );
+
+ // C. Le fichier des messages
+ std::string LogFile = DirCompute ;
+ LogFile += "/Liste." + siterp1 + ".maj_coords.log" ;
+ MESSAGE (". LogFile = " << LogFile);
+ myIteration->SetFileInfo(LogFile.c_str());
+
+ // D. On passe dans le répertoire de l'iteration a calculer
+ MESSAGE ( ". On passe dans DirCompute = " << DirCompute );
+ CHDIR(DirCompute);
+
+ // E. Les données de l'exécution HOMARD
+ // E.1. L'objet du texte du fichier de configuration
+ HomardDriver* myDriver = new HomardDriver("", siterp1);
+ myDriver->TexteInit(DirCompute, LogFile, _Langue);
+
+ // E.2. Le maillage associe a l'iteration
+ const char* NomMesh = myIteration->GetMeshName();
+ MESSAGE ( ". NomMesh = " << NomMesh );
+ const char* MeshFile = myIteration->GetMeshFile();
+ MESSAGE ( ". MeshFile = " << MeshFile );
+
+ // E.3. Les données du traitement HOMARD
+ int iaux ;
+ myDriver->TexteMajCoords( NumeIter ) ;
+ iaux = 0 ;
+ myDriver->TexteMaillageHOMARD( DirCompute, siterp1, iaux ) ;
+ myDriver->TexteMaillage(NomMesh, MeshFile, 0);
+//
+ // E.4. Ecriture du texte dans le fichier
+ MESSAGE ( ". Ecriture du texte dans le fichier de configuration ; codret = "<<codret );
+ if (codret == 0)
+ { myDriver->CreeFichier(); }
+
+// F. Execution
+//
+ int codretexec = 1789 ;
+ if (codret == 0)
+ {
+ codretexec = myDriver->ExecuteHomard(Option1);
+ MESSAGE ( "Erreur en executant HOMARD : " << codretexec );
+ }
+
+ // G. Gestion des resultats
+ if (codret == 0)
+ {
+ // G.1. Le fichier des messages, dans tous les cas
+ const char* NomIteration = myIteration->GetName();
+ std::string Commentaire = "logmaj_coords" ;
+ PublishFileUnderIteration(NomIteration, LogFile.c_str(), Commentaire.c_str());
+ // G.2 Message d'erreur
+ if (codretexec != 0)
+ {
+ std::string text = "\n\nSee the file " + LogFile + "\n" ;
+ INFOS ( text ) ;
+ SALOME::ExceptionStruct es;
+ es.type = SALOME::BAD_PARAM;
+ es.text = CORBA::string_dup(text.c_str());
+ throw SALOME::SALOME_Exception(es);
+
+ // On force le succes pour pouvoir consulter le fichier log
+ codretexec = 0 ;
+ }
+ }
+
+ // H. Menage et retour dans le répertoire du cas
+ if (codret == 0) { delete myDriver; }
+
+ return codret ;
+}
+//=============================================================================
+// Creation d'un nom de sous-répertoire pour l'iteration au sein d'un répertoire parent
+// nomrep : nom du répertoire parent
+// num : le nom du sous-répertoire est sous la forme 'In', n est >= num
//=============================================================================
char* HOMARD_Gen_i::CreateDirNameIter(const char* nomrep, CORBA::Long num )
{
MESSAGE ( "CreateDirNameIter : nomrep ="<< nomrep << ", num = "<<num);
- // On verifie que le repertoire parent existe
+ // On verifie que le répertoire parent existe
int codret = CHDIR(nomrep) ;
if ( codret != 0 )
{
};
std::string nomDirActuel = getenv("PWD") ;
std::string DirName ;
- // On boucle sur tous les noms possibles jusqu'a trouver un nom correspondant a un repertoire inconnu
+ // On boucle sur tous les noms possibles jusqu'a trouver un nom correspondant a un répertoire inconnu
bool a_chercher = true ;
while ( a_chercher )
{
- // On passe dans le repertoire parent
+ // On passe dans le répertoire parent
CHDIR(nomrep);
// On recherche un nom sous la forme Iabc, avec abc representant le numero
iaux << std::setw(jaux) << std::setfill('0') << num ;
std::ostringstream DirNameA ;
DirNameA << "I" << iaux.str();
- // Si on ne pas peut entrer dans le repertoire, on doit verifier
+ // Si on ne pas peut entrer dans le répertoire, on doit verifier
// que c'est bien un probleme d'absence
if ( CHDIR(DirNameA.str().c_str()) != 0 )
{
return CORBA::string_dup( DirName.c_str() );
}
//=============================================================================
-// Calcul d'une iteration : gestion du repertoire de calcul
-// Si le sous-repertoire existe :
-// etatMenage = 0 : on sort en erreur si le repertoire n'est pas vide
-// etatMenage = 1 : on fait le menage du repertoire
+// Calcul d'une iteration : gestion du répertoire de calcul
+// Si le sous-répertoire existe :
+// etatMenage = 0 : on sort en erreur si le répertoire n'est pas vide
+// etatMenage = 1 : on fait le menage du répertoire
// etatMenage = -1 : on ne fait rien
//=============================================================================
char* HOMARD_Gen_i::ComputeDirManagement(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOMARD_Iteration_var myIteration, CORBA::Long etatMenage)
{
- MESSAGE ( "ComputeDirManagement : repertoires pour le calcul" );
- // B.2. Le repertoire du cas
+ MESSAGE ( "ComputeDirManagement : répertoires pour le calcul" );
+ // B.2. Le répertoire du cas
const char* nomDirCase = myCase->GetDirName();
MESSAGE ( ". nomDirCase = " << nomDirCase );
- // B.3. Le sous-repertoire de l'iteration a calculer, puis le repertoire complet a creer
- // B.3.1. Le nom du sous-repertoire
+ // B.3. Le sous-répertoire de l'iteration a calculer, puis le répertoire complet a creer
+ // B.3.1. Le nom du sous-répertoire
const char* nomDirIt = myIteration->GetDirNameLoc();
- // B.3.2. Le nom complet du sous-repertoire
+ // B.3.2. Le nom complet du sous-répertoire
std::stringstream DirCompute ;
DirCompute << nomDirCase << "/" << nomDirIt;
MESSAGE (". DirCompute = " << DirCompute.str() );
- // B.3.3. Si le sous-repertoire n'existe pas, on le cree
+ // B.3.3. Si le sous-répertoire n'existe pas, on le cree
if (CHDIR(DirCompute.str().c_str()) != 0)
{
#ifndef WIN32
#endif
{
// GERALD -- QMESSAGE BOX
- std::cerr << "Pb Creation du repertoire DirCompute = " << DirCompute.str() << std::endl;
- VERIFICATION("Pb a la creation du repertoire" == 0);
+ std::cerr << "Pb Creation du répertoire DirCompute = " << DirCompute.str() << std::endl;
+ VERIFICATION("Pb a la creation du répertoire" == 0);
}
}
else
{
-// Le repertoire existe
+// Le répertoire existe
// On demande de faire le menage de son contenu :
if (etatMenage == 1)
{
- MESSAGE (". Menage du repertoire DirCompute = " << DirCompute.str());
+ MESSAGE (". Menage du répertoire DirCompute = " << DirCompute.str());
std::string commande = "rm -rf " + DirCompute.str()+"/*" ;
int codret = system(commande.c_str());
if (codret != 0)
{
// GERALD -- QMESSAGE BOX
- std::cerr << ". Menage du repertoire de calcul" << DirCompute.str() << std::endl;
- VERIFICATION("Pb au menage du repertoire de calcul" == 0);
+ std::cerr << ". Menage du répertoire de calcul" << DirCompute.str() << std::endl;
+ VERIFICATION("Pb au menage du répertoire de calcul" == 0);
}
}
// On n'a pas demande de faire le menage de son contenu : on sort en erreur :
return CORBA::string_dup( DirCompute.str().c_str() );
}
//=============================================================================
-// Calcul d'une iteration : gestion du repertoire de calcul de l'iteration parent
+// Calcul d'une iteration : gestion du répertoire de calcul de l'iteration parent
//=============================================================================
char* HOMARD_Gen_i::ComputeDirPaManagement(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOMARD_Iteration_var myIteration)
{
- MESSAGE ( "ComputeDirPaManagement : repertoires pour le calcul" );
- // Le repertoire du cas
+ MESSAGE ( "ComputeDirPaManagement : répertoires pour le calcul" );
+ // Le répertoire du cas
const char* nomDirCase = myCase->GetDirName();
MESSAGE ( ". nomDirCase = " << nomDirCase );
- // Le sous-repertoire de l'iteration precedente
+ // Le sous-répertoire de l'iteration precedente
const char* nomIterationParent = myIteration->GetIterParentName();
- HOMARD::HOMARD_Iteration_var myIterationParent = myContextMap[GetCurrentStudyID()]._mesIterations[nomIterationParent];
+ HOMARD::HOMARD_Iteration_var myIterationParent = myStudyContext._mesIterations[nomIterationParent];
const char* nomDirItPa = myIterationParent->GetDirNameLoc();
std::stringstream DirComputePa ;
DirComputePa << nomDirCase << "/" << nomDirItPa;
{
std::string ZoneName = std::string((*ListZone)[iaux]);
MESSAGE ( "... ZoneName = " << ZoneName);
- HOMARD::HOMARD_Zone_var myZone = myContextMap[GetCurrentStudyID()]._mesZones[ZoneName];
+ HOMARD::HOMARD_Zone_var myZone = myStudyContext._mesZones[ZoneName];
ASSERT(!CORBA::is_nil(myZone));
int ZoneType = myZone->GetType();
// 2. les liens avec les groupes
// 3. un entier resumant le type de comportement pour les frontieres
//=============================================================================
-void HOMARD_Gen_i::DriverTexteBoundary(HOMARD::HOMARD_Cas_var myCase, HomardDriver* myDriver)
+int HOMARD_Gen_i::DriverTexteBoundary(HOMARD::HOMARD_Cas_var myCase, HomardDriver* myDriver)
{
MESSAGE ( "... DriverTexteBoundary" );
// 1. Recuperation des frontieres
if ( A_faire == 1 )
{
// 2.2.1. Caracteristiques de la frontiere
- HOMARD::HOMARD_Boundary_var myBoundary = myContextMap[GetCurrentStudyID()]._mesBoundarys[BoundaryName];
+ HOMARD::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[BoundaryName];
ASSERT(!CORBA::is_nil(myBoundary));
int BoundaryType = myBoundary->GetType();
MESSAGE ( "... BoundaryType = " << BoundaryType );
// 2.2.2. Ecriture selon le type
- // 2.2.2.1. Cas d une frontiere discrete
- if (BoundaryType == 0)
+ // 2.2.2.1. Cas d une frontiere CAO
+ if (BoundaryType == -1)
+ {
+// const char* CAOFile = myBoundary->GetDataFile() ;
+// MESSAGE ( ". CAOFile = " << CAOFile );
+ if ( BoundaryOption % 5 != 0 ) { BoundaryOption = BoundaryOption*5 ; }
+ }
+ // 2.2.2.2. Cas d une frontiere discrete
+ else if (BoundaryType == 0)
{
const char* MeshName = myBoundary->GetMeshName() ;
MESSAGE ( ". MeshName = " << MeshName );
- const char* MeshFile = myBoundary->GetMeshFile() ;
+ const char* MeshFile = myBoundary->GetDataFile() ;
MESSAGE ( ". MeshFile = " << MeshFile );
myDriver->TexteBoundaryDi( MeshName, MeshFile);
if ( BoundaryOption % 2 != 0 ) { BoundaryOption = BoundaryOption*2 ; }
}
- // 2.2.2.1. Cas d une frontiere analytique
+ // 2.2.2.3. Cas d une frontiere analytique
else
{
NumBoundaryAnalytical++ ;
{
std::string BoundaryName = std::string((*ListBoundaryGroupType)[NumBoundary]);
MESSAGE ( "... BoundaryName = " << BoundaryName);
- HOMARD::HOMARD_Boundary_var myBoundary = myContextMap[GetCurrentStudyID()]._mesBoundarys[BoundaryName];
+ HOMARD::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[BoundaryName];
ASSERT(!CORBA::is_nil(myBoundary));
int BoundaryType = myBoundary->GetType();
MESSAGE ( "... BoundaryType = " << BoundaryType );
// 3.1. Recuperation du nom du groupe
std::string GroupName = std::string((*ListBoundaryGroupType)[NumBoundary+1]);
MESSAGE ( "... GroupName = " << GroupName);
- // 3.2. Cas d une frontiere discrete
- if ( BoundaryType == 0 )
+ // 3.2. Cas d une frontiere CAO
+ if ( BoundaryType == -1 )
+ {
+ if ( GroupName.size() > 0 ) { myDriver->TexteBoundaryCAOGr ( GroupName ) ; }
+ }
+ // 3.3. Cas d une frontiere discrete
+ else if ( BoundaryType == 0 )
{
if ( GroupName.size() > 0 ) { myDriver->TexteBoundaryDiGr ( GroupName ) ; }
}
- // 3.3. Cas d une frontiere analytique
+ // 3.4. Cas d une frontiere analytique
else
{
NumBoundaryAnalytical++ ;
// 4. Ecriture de l'option finale
myDriver->TexteBoundaryOption(BoundaryOption);
//
- return ;
+ return BoundaryOption ;
}
//=============================================================================
// Calcul d'une iteration : ecriture des interpolations dans le fichier de configuration
// Le type d'interpolation
std::string TypeInterpstr = std::string((*ListField)[iaux+1]) ;
MESSAGE( "... FieldName = " << FieldName << ", TypeInterp = " << TypeInterpstr );
- // On cherche à savoir si des instants ont été précisés pour cette itération
+ // On cherche ?? savoir si des instants ont ??t?? pr??cis??s pour cette it??ration
int tsrvu = 0;
for (int jaux = 0; jaux< numberOfFieldsx3; jaux++)
{
// Publications
//===========================================================================
//===========================================================================
-SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy,
- SALOMEDS::SObject_ptr theSObject,
+SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr theSObject,
CORBA::Object_ptr theObject,
const char* theName)
{
MESSAGE("PublishInStudy pour " << theName);
SALOMEDS::SObject_var aResultSO;
- if (CORBA::is_nil(theStudy))
+ if (CORBA::is_nil(myStudy))
{
SALOME::ExceptionStruct es;
es.type = SALOME::BAD_PARAM;
HOMARD::HOMARD_YACS_var aYACS = HOMARD::HOMARD_YACS::_narrow(theObject);
HOMARD::HOMARD_Zone_var aZone = HOMARD::HOMARD_Zone::_narrow(theObject);
- addInStudy(theStudy);
+ UpdateStudy();
// Controle de la non publication d'un objet de meme nom
if ( (!aBoundary->_is_nil()) || (!aHypo->_is_nil()) || (!aYACS->_is_nil()) || (!aZone->_is_nil()) )
{
- SALOMEDS::Study::ListOfSObject_var listSO = theStudy->FindObjectByName(theName, ComponentDataType());
+ SALOMEDS::Study::ListOfSObject_var listSO = myStudy->FindObjectByName(theName, ComponentDataType());
if (listSO->length() >= 1)
{
MESSAGE("This name "<<theName<<" is already used "<<listSO->length()<<" time(s)");
}
// Caracteristiques de l'etude
- SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder();
+ SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
aStudyBuilder->NewCommand();
if(!aBoundary->_is_nil())
- aResultSO = PublishBoundaryInStudy(theStudy, aStudyBuilder, aBoundary, theName);
+ aResultSO = PublishBoundaryInStudy(aStudyBuilder, aBoundary, theName);
else if(!aCase->_is_nil())
- aResultSO = PublishCaseInStudy(theStudy, aStudyBuilder, aCase, theName);
+ aResultSO = PublishCaseInStudy(aStudyBuilder, aCase, theName);
else if(!aHypo->_is_nil())
- aResultSO = PublishHypotheseInStudy(theStudy, aStudyBuilder, aHypo, theName);
+ aResultSO = PublishHypotheseInStudy(aStudyBuilder, aHypo, theName);
else if(!aYACS->_is_nil())
- aResultSO = PublishYACSInStudy(theStudy, aStudyBuilder, aYACS, theName);
+ aResultSO = PublishYACSInStudy(aStudyBuilder, aYACS, theName);
else if(!aZone->_is_nil())
- aResultSO = PublishZoneInStudy(theStudy, aStudyBuilder, aZone, theName);
+ aResultSO = PublishZoneInStudy(aStudyBuilder, aZone, theName);
aStudyBuilder->CommitCommand();
return aResultSO._retn();
};
//=============================================================================
-SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishBoundaryInStudy(SALOMEDS::Study_ptr theStudy,
- SALOMEDS::StudyBuilder_var aStudyBuilder,
+SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishBoundaryInStudy( SALOMEDS::StudyBuilder_var aStudyBuilder,
HOMARD::HOMARD_Boundary_ptr theObject, const char* theName)
{
MESSAGE("PublishBoundaryStudy pour "<<theName);
SALOMEDS::SObject_var aResultSO;
// Caracteristique de la Boundary
- HOMARD::HOMARD_Boundary_var myBoundary = myContextMap[GetCurrentStudyID()]._mesBoundarys[theName];
+ HOMARD::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[theName];
// On recupere le module pere dans l etude
- SALOMEDS::SComponent_var theFatherHomard = theStudy->FindComponent(ComponentDataType());
+ SALOMEDS::SComponent_var theFatherHomard = myStudy->FindComponent(ComponentDataType());
if (theFatherHomard->_is_nil())
{
MESSAGE("theFatherHomard->_is_nil()");
std::string value ;
switch (BoundaryType)
{
+ case -1 :
+ { value = "BoundaryCAOHomard" ;
+ icone = "geometry.png" ;
+ break;
+ }
case 0 :
{ value = "BoundaryDiHomard" ;
icone = "mesh_tree_mesh.png" ;
return aResultSO._retn();
}
//=============================================================================
-SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishCaseInStudy(SALOMEDS::Study_ptr theStudy,
- SALOMEDS::StudyBuilder_var aStudyBuilder,
+SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishCaseInStudy(SALOMEDS::StudyBuilder_var aStudyBuilder,
HOMARD::HOMARD_Cas_ptr theObject, const char* theName)
{
MESSAGE("PublishCaseInStudy pour "<<theName);
MESSAGE("HOMARD_Gen_i::theObject->_is_nil()");
return aResultSO._retn();
}
- if (theStudy->_is_nil()) {
- MESSAGE("HOMARD_Gen_i::theStudy->_is_nil()");
+ if (myStudy->_is_nil()) {
+ MESSAGE("HOMARD_Gen_i::myStudy->_is_nil()");
return aResultSO._retn();
}
// On recupere le module pere dans l etude
- SALOMEDS::SComponent_var theFatherHomard = theStudy->FindComponent(ComponentDataType());
+ SALOMEDS::SComponent_var theFatherHomard = myStudy->FindComponent(ComponentDataType());
if (theFatherHomard->_is_nil())
{
MESSAGE("theFatherHomard->_is_nil()");
return aResultSO._retn();
}
//=============================================================================
-SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishHypotheseInStudy(SALOMEDS::Study_ptr theStudy,
- SALOMEDS::StudyBuilder_var aStudyBuilder,
+SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishHypotheseInStudy(SALOMEDS::StudyBuilder_var aStudyBuilder,
HOMARD::HOMARD_Hypothesis_ptr theObject, const char* theName)
{
MESSAGE("PublishHypotheseInStudy pour "<<theName);
// On recupere le module pere dans l etude
// On ajoute la categorie des hypotheses dans l etude si necessaire
- SALOMEDS::SComponent_var theFatherHomard = theStudy->FindComponent(ComponentDataType());
+ SALOMEDS::SComponent_var theFatherHomard = myStudy->FindComponent(ComponentDataType());
if (theFatherHomard->_is_nil())
{
MESSAGE("theFatherHomard->_is_nil()");
return aResultSO._retn();
}
//=============================================================================
-SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishYACSInStudy(SALOMEDS::Study_ptr theStudy,
- SALOMEDS::StudyBuilder_var aStudyBuilder,
+SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishYACSInStudy(SALOMEDS::StudyBuilder_var aStudyBuilder,
HOMARD::HOMARD_YACS_ptr theObject, const char* theName)
{
MESSAGE("PublishYACSInStudy pour "<<theName);
// On recupere le module pere dans l etude
// On ajoute la categorie des schemas YACS dans l etude si necessaire
- SALOMEDS::SComponent_var theFatherHomard = theStudy->FindComponent(ComponentDataType());
+ SALOMEDS::SComponent_var theFatherHomard = myStudy->FindComponent(ComponentDataType());
if (theFatherHomard->_is_nil())
{
MESSAGE("theFatherHomard->_is_nil()");
}
//=============================================================================
-SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishZoneInStudy(SALOMEDS::Study_ptr theStudy,
- SALOMEDS::StudyBuilder_var aStudyBuilder,
+SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishZoneInStudy(SALOMEDS::StudyBuilder_var aStudyBuilder,
HOMARD::HOMARD_Zone_ptr theObject, const char* theName)
{
MESSAGE("PublishZoneStudy pour "<<theName);
MESSAGE("PublishZoneInStudy : theObject->_is_nil()");
return aResultSO._retn();
}
- if (theStudy->_is_nil())
+ if (myStudy->_is_nil())
{
- MESSAGE("PublishZoneInStudy : theStudy->_is_nil()");
+ MESSAGE("PublishZoneInStudy : myStudy->_is_nil()");
return aResultSO._retn();
}
- SALOMEDS::SComponent_var theFatherHomard = theStudy->FindComponent(ComponentDataType());
+ SALOMEDS::SComponent_var theFatherHomard = myStudy->FindComponent(ComponentDataType());
if (theFatherHomard->_is_nil())
{
MESSAGE("PublishZoneInStudy : theFatherHomard->_is_nil()");
}
// Caracteristique de la zone
- HOMARD::HOMARD_Zone_var myZone = myContextMap[GetCurrentStudyID()]._mesZones[theName];
+ HOMARD::HOMARD_Zone_var myZone = myStudyContext._mesZones[theName];
CORBA::Long ZoneType = myZone->GetType();
// On ajoute la categorie des zones dans l etude si necessaire
{
MESSAGE ( "PublishBoundaryUnderCase : CaseName = " << CaseName << ", BoundaryName= " << BoundaryName );
- HOMARD::HOMARD_Cas_var myCase = myContextMap[GetCurrentStudyID()]._mesCas[CaseName];
+ HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[CaseName];
ASSERT(!CORBA::is_nil(myCase));
- SALOMEDS::SObject_var aCaseSO = SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myCase)));
+ SALOMEDS::SObject_var aCaseSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myCase)));
ASSERT(!CORBA::is_nil(aCaseSO));
- HOMARD::HOMARD_Boundary_var myBoundary = myContextMap[GetCurrentStudyID()]._mesBoundarys[BoundaryName];
+ HOMARD::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[BoundaryName];
ASSERT(!CORBA::is_nil(myBoundary));
- SALOMEDS::SObject_var aBoundarySO = SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myBoundary)));
+ SALOMEDS::SObject_var aBoundarySO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myBoundary)));
ASSERT(!CORBA::is_nil(aBoundarySO));
- SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+ SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
aStudyBuilder->NewCommand();
{
MESSAGE ( "PublishCaseUnderYACS : nomYACS = " << nomYACS << ", CaseName= " << CaseName );
- HOMARD::HOMARD_YACS_var myYACS = myContextMap[GetCurrentStudyID()]._mesYACSs[nomYACS];
+ HOMARD::HOMARD_YACS_var myYACS = myStudyContext._mesYACSs[nomYACS];
ASSERT(!CORBA::is_nil(myYACS));
- SALOMEDS::SObject_var aYACSSO = SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myYACS)));
+ SALOMEDS::SObject_var aYACSSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myYACS)));
ASSERT(!CORBA::is_nil(aYACSSO));
- HOMARD::HOMARD_Cas_var myCase = myContextMap[GetCurrentStudyID()]._mesCas[CaseName];
+ HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[CaseName];
ASSERT(!CORBA::is_nil(myCase));
- SALOMEDS::SObject_var aCaseSO = SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myCase)));
+ SALOMEDS::SObject_var aCaseSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myCase)));
ASSERT(!CORBA::is_nil(aCaseSO));
- SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+ SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
aStudyBuilder->NewCommand();
// Option = 1 : fichier issu d'une execution HOMARD
{
MESSAGE( "PublishResultInSmesh " << NomFich << ", avec Option = " << Option);
- if (CORBA::is_nil(myCurrentStudy))
+ if (CORBA::is_nil(myStudy))
{
SALOME::ExceptionStruct es;
es.type = SALOME::BAD_PARAM;
};
// Le module SMESH est-il actif ?
- SALOMEDS::SObject_var aSmeshSO = myCurrentStudy->FindComponent("SMESH");
+ SALOMEDS::SObject_var aSmeshSO = myStudy->FindComponent("SMESH");
//
if (!CORBA::is_nil(aSmeshSO))
{
// On verifie que le fichier n est pas deja publie
- SALOMEDS::ChildIterator_var aIter = myCurrentStudy->NewChildIterator(aSmeshSO);
+ SALOMEDS::ChildIterator_var aIter = myStudy->NewChildIterator(aSmeshSO);
for (; aIter->More(); aIter->Next())
{
SALOMEDS::SObject_var aSO = aIter->Value();
// On enregistre le fichier
MESSAGE( "Enregistrement du fichier");
- SALOME_LifeCycleCORBA* myLCC = new SALOME_LifeCycleCORBA(_NS);
- SMESH::SMESH_Gen_var aSmeshEngine = SMESH::SMESH_Gen::_narrow(myLCC->FindOrLoad_Component("FactoryServer","SMESH"));
+ //
+ SMESH::SMESH_Gen_var aSmeshEngine = this->retrieveSMESHInst();
+ //
ASSERT(!CORBA::is_nil(aSmeshEngine));
- aSmeshEngine->SetCurrentStudy(myCurrentStudy);
+ aSmeshEngine->UpdateStudy();
SMESH::DriverMED_ReadStatus theStatus;
//aSmeshEngine->CreateMeshesFromMED(NomFich, theStatus);
{
MESSAGE( ". Mise a jour des attributs du maillage");
SMESH::SMESH_Mesh_var monMaillage= (*mesMaillages)[i];
- SALOMEDS::SObject_var aSO=SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(monMaillage)));
- SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+ SALOMEDS::SObject_var aSO=SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(monMaillage)));
+ SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
SALOMEDS::GenericAttribute_var aGAttr = aStudyBuilder->FindOrCreateAttribute(aSO, "AttributeExternalFileDef");
SALOMEDS::AttributeExternalFileDef_var anAttr = SALOMEDS::AttributeExternalFileDef::_narrow(aGAttr);
anAttr->SetValue(NomFich);
void HOMARD_Gen_i::DeleteResultInSmesh(std::string NomFich, std::string MeshName)
{
MESSAGE ("DeleteResultInSmesh pour le maillage " << MeshName << " dans le fichier " << NomFich );
- if (CORBA::is_nil(myCurrentStudy))
+ if (CORBA::is_nil(myStudy))
{
SALOME::ExceptionStruct es;
es.type = SALOME::BAD_PARAM;
};
// Le module SMESH est-il actif ?
- SALOMEDS::SObject_var aSmeshSO = myCurrentStudy->FindComponent("SMESH");
+ SALOMEDS::SObject_var aSmeshSO = myStudy->FindComponent("SMESH");
//
if (CORBA::is_nil(aSmeshSO))
{
return ;
};
// On verifie que le fichier est deja publie
- SALOMEDS::StudyBuilder_var myBuilder = myCurrentStudy->NewBuilder();
- SALOMEDS::ChildIterator_var aIter = myCurrentStudy->NewChildIterator(aSmeshSO);
+ SALOMEDS::StudyBuilder_var myBuilder = myStudy->NewBuilder();
+ SALOMEDS::ChildIterator_var aIter = myStudy->NewChildIterator(aSmeshSO);
for (; aIter->More(); aIter->Next())
{
SALOMEDS::SObject_var aSO = aIter->Value();
void HOMARD_Gen_i::PublishMeshIterInSmesh(const char* NomIter)
{
MESSAGE( "PublishMeshIterInSmesh " << NomIter);
- HOMARD::HOMARD_Iteration_var myIteration = myContextMap[GetCurrentStudyID()]._mesIterations[NomIter];
+ HOMARD::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[NomIter];
- SALOMEDS::SObject_var aIterSO=SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myIteration)));
+ SALOMEDS::SObject_var aIterSO=SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myIteration)));
if (CORBA::is_nil(myIteration))
{
SALOME::ExceptionStruct es;
void HOMARD_Gen_i::PublishFileUnderIteration(const char* NomIter, const char* NomFich, const char* Commentaire)
{
// MESSAGE ("PublishFileUnderIteration pour l'iteration " << NomIter << " du fichier " << NomFich << " avec le commentaire " << Commentaire );
- HOMARD::HOMARD_Iteration_var myIteration = myContextMap[GetCurrentStudyID()]._mesIterations[NomIter];
+ HOMARD::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[NomIter];
- SALOMEDS::SObject_var aIterSO=SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myIteration)));
+ SALOMEDS::SObject_var aIterSO=SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myIteration)));
if (CORBA::is_nil(myIteration))
{
SALOME::ExceptionStruct es;
return ;
};
- SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+ SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
aStudyBuilder->NewCommand();
void HOMARD_Gen_i::PublishFileUnderYACS(const char* nomYACS, const char* NomFich, const char* Commentaire)
{
// MESSAGE ("PublishFileUnderYACS pour le schema " << nomYACS << " du fichier " << NomFich << " avec le commentaire " << Commentaire );
- HOMARD::HOMARD_YACS_var myYACS = myContextMap[GetCurrentStudyID()]._mesYACSs[nomYACS];
+ HOMARD::HOMARD_YACS_var myYACS = myStudyContext._mesYACSs[nomYACS];
- SALOMEDS::SObject_var aYACSSO=SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myYACS)));
+ SALOMEDS::SObject_var aYACSSO=SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myYACS)));
if (CORBA::is_nil(myYACS))
{
SALOME::ExceptionStruct es;
return ;
};
- SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+ SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
aStudyBuilder->NewCommand();
// Creation d'un schema YACS
// nomCas : nom du cas a traiter
// FileName : nom du fichier contenant le script de lancement du calcul
-// DirName : le repertoire de lancement des calculs du schéma
+// DirName : le répertoire de lancement des calculs du schéma
//=============================================================================
HOMARD::HOMARD_YACS_ptr HOMARD_Gen_i::CreateYACSSchema (const char* nomYACS, const char* nomCas, const char* ScriptFile, const char* DirName, const char* MeshFile)
{
- INFOS ( "CreateYACSSchema : Schema YACS " << nomYACS );
- INFOS ( ". nomCas : " << nomCas);
- INFOS ( ". ScriptFile : " << ScriptFile);
- INFOS ( ". DirName : " << DirName);
- INFOS ( ". MeshFile : " << MeshFile);
+ MESSAGE ( "CreateYACSSchema : Schema YACS " << nomYACS );
+ MESSAGE ( ". nomCas : " << nomCas);
+ MESSAGE ( ". ScriptFile : " << ScriptFile);
+ MESSAGE ( ". DirName : " << DirName);
+ MESSAGE ( ". MeshFile : " << MeshFile);
// A. Controle du nom :
- if ((myContextMap[GetCurrentStudyID()]._mesYACSs).find(nomYACS) != (myContextMap[GetCurrentStudyID()]._mesYACSs).end())
+ if ((myStudyContext._mesYACSs).find(nomYACS) != (myStudyContext._mesYACSs).end())
{
SALOME::ExceptionStruct es;
es.type = SALOME::BAD_PARAM;
myYACS->SetName( nomYACS ) ;
// C. Enregistrement
- myContextMap[GetCurrentStudyID()]._mesYACSs[nomYACS] = myYACS;
+ myStudyContext._mesYACSs[nomYACS] = myYACS;
SALOMEDS::SObject_var aSO;
- SALOMEDS::SObject_var aResultSO=PublishInStudy(myCurrentStudy, aSO, myYACS, nomYACS);
+ SALOMEDS::SObject_var aResultSO=PublishInStudy(aSO, myYACS, nomYACS);
PublishCaseUnderYACS(nomYACS, nomCas);
myYACS->SetMaxNode( defaut_i ) ;
defaut_i = GetYACSMaxElem() ;
myYACS->SetMaxElem( defaut_i ) ;
- // D.3. Fichier de sauvegarde dans le repertoire du cas
+ // D.3. Fichier de sauvegarde dans le répertoire du cas
HOMARD::HOMARD_Cas_ptr caseyacs = GetCase(nomCas) ;
std::string dirnamecase = caseyacs->GetDirName() ;
std::string XMLFile ;
//=============================================================================
CORBA::Long HOMARD_Gen_i::YACSWrite(const char* nomYACS)
{
- INFOS ( "YACSWrite : Ecriture de " << nomYACS );
-// Le repertoire du cas
- HOMARD::HOMARD_YACS_var myYACS = myContextMap[GetCurrentStudyID()]._mesYACSs[nomYACS];
+ MESSAGE ( "YACSWrite : Ecriture de " << nomYACS );
+// Le répertoire du cas
+ HOMARD::HOMARD_YACS_var myYACS = myStudyContext._mesYACSs[nomYACS];
ASSERT(!CORBA::is_nil(myYACS));
// Le nom du fichier du schema
std::string XMLFile ;
//=============================================================================
CORBA::Long HOMARD_Gen_i::YACSWriteOnFile(const char* nomYACS, const char* XMLFile)
{
- INFOS ( "YACSWriteOnFile : Ecriture de " << nomYACS << " sur " << XMLFile );
+ MESSAGE ( "YACSWriteOnFile : Ecriture de " << nomYACS << " sur " << XMLFile );
// A. Prealable
int codret = 0;
// B. L'objet YACS
// B.1. L'objet
- HOMARD::HOMARD_YACS_var myYACS = myContextMap[GetCurrentStudyID()]._mesYACSs[nomYACS];
+ HOMARD::HOMARD_YACS_var myYACS = myStudyContext._mesYACSs[nomYACS];
ASSERT(!CORBA::is_nil(myYACS));
// B.2. Les caracteristiques
std::string DirName = myYACS->GetDirName() ;
// C. Le cas
// C.1. L'objet cas
const char* nomCas = myYACS->GetCaseName();
- HOMARD::HOMARD_Cas_var myCase = myContextMap[GetCurrentStudyID()]._mesCas[nomCas];
+ HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas];
ASSERT(!CORBA::is_nil(myCase));
// C.2. Les instructions python associees au cas
CORBA::String_var dumpCorbaCase = myCase->GetDumpPython();
// E.1. La structure
std::string nomHypo = Iter1->GetHypoName();
MESSAGE (". nomHypo = " << nomHypo);
- HOMARD::HOMARD_Hypothesis_var myHypo = myContextMap[GetCurrentStudyID()]._mesHypotheses[nomHypo];
+ HOMARD::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypo];
ASSERT(!CORBA::is_nil(myHypo));
// E.2. Les caracteristiques de l'adaptation
HOMARD::listeTypes* ListTypes = myHypo->GetAdapRefinUnRef();
MESSAGE ("pythonHypo :\n"<<pythonHypo<<"\n");
// F. Le fichier du schema de reference
- // HOMARD_ROOT_DIR : repertoire ou se trouve le module HOMARD
+ // HOMARD_ROOT_DIR : répertoire ou se trouve le module HOMARD
std::string XMLFile_base ;
if ( getenv("HOMARD_ROOT_DIR") != NULL ) { XMLFile_base = getenv("HOMARD_ROOT_DIR") ; }
else
// if ( _Langue ==
MESSAGE("XMLFile_base ="<<XMLFile_base);
- // G. Lecture du schema de reference et insertion des donnees propres au fil de la rencontre des mots-cles
- YACSDriver* myDriver = new YACSDriver(XMLFile, DirName);
+ // G. Lecture du schema de reference et insertion des données propres au fil de la rencontre des mots-cles
+ YACSDriver* myDriver = new YACSDriver(XMLFile, DirName, _LangueShort);
std::ifstream fichier( XMLFile_base.c_str() );
if ( fichier ) // ce test échoue si le fichier n'est pas ouvert
{
- // G.1. Lecture du schema de reference et insertion des donnees propres au fil de la rencontre des mots-cles
+ // G.1. Lecture du schema de reference et insertion des données propres au fil de la rencontre des mots-cles
std::string ligne; // variable contenant chaque ligne lue
std::string mot_cle;
while ( std::getline( fichier, ligne ) )
// G.1.4. Les options du cas
else if ( mot_cle == "Iter_1_Case_Options" )
{ myDriver->Texte_Iter_1_Case_Options(pythonCas); }
- // G.1.5. Execution de HOMARD : le repertoire du cas
+ // G.1.5. Execution de HOMARD : le répertoire du cas
else if ( mot_cle == "HOMARD_Exec_DirName" )
{ myDriver->Texte_HOMARD_Exec_DirName(); }
// G.1.6. Execution de HOMARD : le nom du maillage
else if ( mot_cle == "HOMARD_Exec_MeshName" )
{
myDriver->Texte_HOMARD_Exec_MeshName(MeshName);
- std::string node = "Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1.CreateCase" ;
+ std::string node ;
+ if ( _LangueShort == "fr" ) { node = "Boucle_de_convergence.Alternance_Calcul_HOMARD" ; }
+ else { node = "Convergence_Loop.Alternation_Computation_HOMARD" ; }
+ node += ".Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1.CreateCase" ;
myDriver->TexteParametre( node, "MeshName", "string", MeshName ) ;
}
// G.1.7. Execution de HOMARD : les options de l'hypothese
// 1. Reperage de la zone
std::string ZoneName = std::string((*ListZone)[iaux]);
MESSAGE ( "\n. ZoneName = " << ZoneName << " - " <<iaux);
- HOMARD::HOMARD_Zone_var myZone = myContextMap[GetCurrentStudyID()]._mesZones[ZoneName];
+ HOMARD::HOMARD_Zone_var myZone = myStudyContext._mesZones[ZoneName];
ASSERT(!CORBA::is_nil(myZone));
// 2. Les instructions python associees a la zone
// La premiere ligne est un commentaire a eliminer
if ( A_faire == 1 )
{
// 1. Caracteristiques de la frontiere
- HOMARD::HOMARD_Boundary_var myBoundary = myContextMap[GetCurrentStudyID()]._mesBoundarys[BoundaryName];
+ HOMARD::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[BoundaryName];
ASSERT(!CORBA::is_nil(myBoundary));
// 2. Les instructions python associees a la frontiere
// La premiere ligne est un commentaire a eliminer
int BoundaryType = myBoundary->GetType();
MESSAGE ( "... BoundaryType = " << BoundaryType);
const char* MeshName ;
- const char* MeshFile ;
- if (BoundaryType == 0)
+ const char* DataFile ;
+ if (BoundaryType == -1)
+ {
+ DataFile = myBoundary->GetDataFile() ;
+ MESSAGE ( ". CAOFile = " << DataFile );
+ }
+ else if (BoundaryType == 0)
{
MeshName = myBoundary->GetMeshName() ;
MESSAGE ( ". MeshName = " << MeshName );
- MeshFile = myBoundary->GetMeshFile() ;
- MESSAGE ( ". MeshFile = " << MeshFile );
+ DataFile = myBoundary->GetDataFile() ;
+ MESSAGE ( ". MeshFile = " << DataFile );
}
std::string texte_control_0 ;
- texte_control_0 = myDriver->Texte_Iter_1_Boundary(BoundaryType, pythonStructure, methode, BoundaryName, MeshName, MeshFile );
+ texte_control_0 = myDriver->Texte_Iter_1_Boundary(BoundaryType, pythonStructure, methode, BoundaryName, MeshName, DataFile );
texte_control += texte_control_0 ;
// 5. Memorisation du traitement
ListeBoundaryTraitees.push_back( BoundaryName );
// get temporary directory name
std::string tmpDir = isMultiFile ? std::string(theURL) : SALOMEDS_Tool::GetTmpDir();
- SALOMEDS::Study_var aStudy = theComponent->GetStudy();
- StudyContext& context = myContextMap[ aStudy->StudyId() ];
+ StudyContext& context = myStudyContext;
// HOMARD data file name
std::string aFileName = "";
if (isMultiFile)
- aFileName = SALOMEDS_Tool::GetNameFromPath(aStudy->URL());
+ aFileName = SALOMEDS_Tool::GetNameFromPath(Kernel_Utils::encode(myStudy->URL()));
aFileName += "_HOMARD.dat";
// initialize sequence of file names
- SALOMEDS::ListOfFileNames_var aFileSeq = new SALOMEDS::ListOfFileNames;
- aFileSeq->length(1);
- aFileSeq[0] = CORBA::string_dup(aFileName.c_str()) ;
+ SALOMEDS_Tool::ListOfFiles aFileSeq;
+ aFileSeq.reserve(1);
+ aFileSeq.push_back(CORBA::string_dup(aFileName.c_str())) ;
// get full path to the data file
aFileName = tmpDir + aFileName;
// put temporary files to the stream
MESSAGE ("put temporary files to the stream");
- aStreamFile = SALOMEDS_Tool::PutFilesToStream(tmpDir.c_str(), aFileSeq.in(), isMultiFile);
+ aStreamFile = SALOMEDS_Tool::PutFilesToStream(tmpDir.c_str(), aFileSeq, isMultiFile);
// remove temporary files
MESSAGE ("remove temporary files");
- if (!isMultiFile) SALOMEDS_Tool::RemoveTemporaryFiles(tmpDir.c_str(), aFileSeq.in(), true);
+ if (!isMultiFile) SALOMEDS_Tool::RemoveTemporaryFiles(tmpDir.c_str(), aFileSeq, true);
// return data stream
MESSAGE ("return data stream");
CORBA::Boolean isMultiFile)
{
MESSAGE ("Load pour theURL = "<< theURL);
- SALOMEDS::Study_var aStudy = theComponent->GetStudy();
// set current study
- if (myCurrentStudy->_is_nil() || aStudy->StudyId() != myCurrentStudy->StudyId())
- SetCurrentStudy(aStudy);
+ if (myStudy->_is_nil())
+ UpdateStudy();
// get temporary directory name
std::string tmpDir = isMultiFile ? std::string(theURL) : SALOMEDS_Tool::GetTmpDir();
// Convert the stream into sequence of files to process
- SALOMEDS::ListOfFileNames_var aFileSeq = SALOMEDS_Tool::PutStreamToFiles(theStream,
- tmpDir.c_str(),
- isMultiFile);
+ SALOMEDS_Tool::ListOfFiles aFileSeq = SALOMEDS_Tool::PutStreamToFiles(theStream,
+ tmpDir.c_str(),
+ isMultiFile);
// HOMARD data file name
std::string aFileName = "";
if (isMultiFile)
- aFileName = SALOMEDS_Tool::GetNameFromPath(aStudy->URL());
+ aFileName = SALOMEDS_Tool::GetNameFromPath(Kernel_Utils::encode(myStudy->URL()));
aFileName = tmpDir + aFileName + "_HOMARD.dat";
- StudyContext& context = myContextMap[ aStudy->StudyId() ];
+ StudyContext& context = myStudyContext;
// save data
// -> create file
// Remove temporary files created from the stream
if (!isMultiFile)
- SALOMEDS_Tool::RemoveTemporaryFiles(tmpDir.c_str(), aFileSeq.in(), true);
+ SALOMEDS_Tool::RemoveTemporaryFiles(tmpDir.c_str(), aFileSeq, true);
return true;
};
//===========================================================================
void HOMARD_Gen_i::Close(SALOMEDS::SComponent_ptr theComponent)
{
- if (theComponent->GetStudy()->StudyId() == GetCurrentStudyID()) {
- // clearing study context should be done here:
- // - destroy all servants and related CORBA objects
- // ... (TODO)
- // - remove context from myContextMap
- myContextMap.erase(theComponent->GetStudy()->StudyId());
- // - nullify myCurrentStudy
- myCurrentStudy = SALOMEDS::Study::_nil();
- }
};
//===========================================================================
{
CORBA::String_var aString("");
if (!CORBA::is_nil(theSObject) && strcmp(IORString, "") != 0) {
- StudyContext context = myContextMap[ theSObject->GetStudy()->StudyId() ];
+ StudyContext context = myStudyContext;
CORBA::Object_var anObj = _orb->string_to_object(IORString);
if (!CORBA::is_nil(anObj)) {
PortableServer::ServantBase_var aServant = GetServant(anObj);
{
CORBA::String_var aString("");
if (!CORBA::is_nil(theSObject) && strcmp(aLocalPersistentID, "") != 0) {
- StudyContext context = myContextMap[ theSObject->GetStudy()->StudyId() ];
+ StudyContext context = myStudyContext;
int id = atoi(aLocalPersistentID);
if (id > 0 && context._idmap.find(id) != context._idmap.end()) {
CORBA::Object_var object = _poa->servant_to_reference(context._idmap[ id ]);
//===========================================================================
CORBA::Boolean HOMARD_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR)
{
- if(CORBA::is_nil(myCurrentStudy))
+ if(CORBA::is_nil(myStudy))
return false;
HOMARD::HOMARD_Cas_var aCas = HOMARD::HOMARD_Cas::_narrow(theIOR);
}
//==========================================================================
-Engines::TMPFile* HOMARD_Gen_i::DumpPython(CORBA::Object_ptr theStudy,
- CORBA::Boolean isPublished,
- CORBA::Boolean isMultiFile,
- CORBA::Boolean& isValidScript)
+Engines::TMPFile* HOMARD_Gen_i::DumpPython(CORBA::Boolean isPublished,
+ CORBA::Boolean isMultiFile,
+ CORBA::Boolean& isValidScript)
{
MESSAGE ("Entree dans DumpPython");
isValidScript=1;
- SALOMEDS::Study_var aStudy = SALOMEDS::Study::_narrow(theStudy);
- if(CORBA::is_nil(aStudy))
- return new Engines::TMPFile(0);
- SALOMEDS::SObject_var aSO = aStudy->FindComponent("HOMARD");
+ SALOMEDS::SObject_var aSO = myStudy->FindComponent("HOMARD");
if(CORBA::is_nil(aSO))
return new Engines::TMPFile(0);
if( isMultiFile )
aScript += "import salome\n";
aScript += "homard = salome.lcc.FindOrLoadComponent('FactoryServer','HOMARD')\n";
- if( isMultiFile ) {
- aScript += "def RebuildData(theStudy):\n";
- aScript += "\thomard.SetCurrentStudy(theStudy)\n";
- }
- else
- aScript += "\thomard.SetCurrentStudy(salome.myStudy)\n";
+ aScript += "\thomard.UpdateStudy()\n";
MESSAGE (". Au depart \n"<<aScript);
- if (myContextMap[GetCurrentStudyID()]._mesBoundarys.size() > 0)
+ if (myStudyContext._mesBoundarys.size() > 0)
{
MESSAGE (". Ecritures des frontieres");
aScript += "#\n# Creation of the boundaries";
aScript += "\n# ==========================";
}
std::map<std::string, HOMARD::HOMARD_Boundary_var>::const_iterator it_boundary;
- for (it_boundary = myContextMap[GetCurrentStudyID()]._mesBoundarys.begin();
- it_boundary != myContextMap[GetCurrentStudyID()]._mesBoundarys.end(); ++it_boundary)
+ for (it_boundary = myStudyContext._mesBoundarys.begin();
+ it_boundary != myStudyContext._mesBoundarys.end(); ++it_boundary)
{
HOMARD::HOMARD_Boundary_var maBoundary = (*it_boundary).second;
CORBA::String_var dumpCorbaBoundary = maBoundary->GetDumpPython();
}
- if (myContextMap[GetCurrentStudyID()]._mesZones.size() > 0)
+ if (myStudyContext._mesZones.size() > 0)
{
MESSAGE (". Ecritures des zones");
aScript += "#\n# Creation of the zones";
aScript += "\n# =====================";
}
std::map<std::string, HOMARD::HOMARD_Zone_var>::const_iterator it_zone;
- for ( it_zone = myContextMap[GetCurrentStudyID()]._mesZones.begin();
- it_zone != myContextMap[GetCurrentStudyID()]._mesZones.end(); ++it_zone)
+ for ( it_zone = myStudyContext._mesZones.begin();
+ it_zone != myStudyContext._mesZones.end(); ++it_zone)
{
HOMARD::HOMARD_Zone_var myZone = (*it_zone).second;
CORBA::String_var dumpCorbaZone = myZone->GetDumpPython();
}
- if (myContextMap[GetCurrentStudyID()]._mesHypotheses.size() > 0)
+ if (myStudyContext._mesHypotheses.size() > 0)
{
MESSAGE (". Ecritures des hypotheses");
aScript += "#\n# Creation of the hypotheses";
aScript += "\n# ==========================";
}
std::map<std::string, HOMARD::HOMARD_Hypothesis_var>::const_iterator it_hypo;
- for ( it_hypo = myContextMap[GetCurrentStudyID()]._mesHypotheses.begin();
- it_hypo != myContextMap[GetCurrentStudyID()]._mesHypotheses.end(); it_hypo++)
+ for ( it_hypo = myStudyContext._mesHypotheses.begin();
+ it_hypo != myStudyContext._mesHypotheses.end(); it_hypo++)
{
HOMARD::HOMARD_Hypothesis_var monHypo = (*it_hypo).second;
CORBA::String_var dumpCorbaHypo = monHypo->GetDumpPython();
}
- if (myContextMap[GetCurrentStudyID()]._mesCas.size() > 0)
+ if (myStudyContext._mesCas.size() > 0)
{
MESSAGE (". Ecritures des cas");
aScript += "#\n# Creation of the cases";
aScript += "\n# =====================";
}
std::map<std::string, HOMARD::HOMARD_Cas_var>::const_iterator it_cas;
- for (it_cas = myContextMap[GetCurrentStudyID()]._mesCas.begin();
- it_cas != myContextMap[GetCurrentStudyID()]._mesCas.end(); it_cas++)
+ for (it_cas = myStudyContext._mesCas.begin();
+ it_cas != myStudyContext._mesCas.end(); it_cas++)
{
std::string nomCas = (*it_cas).first;
std::string dumpCas = std::string("\n# Creation of the case ") ;
CORBA::String_var cIter0= myCase->GetIter0Name();
std::string iter0 = cIter0.in();
- HOMARD::HOMARD_Iteration_var myIteration = myContextMap[GetCurrentStudyID()]._mesIterations[iter0];
+ HOMARD::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[iter0];
CORBA::String_var cMesh0= myIteration->GetMeshFile();
std::string mesh0 = cMesh0.in();
CORBA::String_var cMeshName0= myIteration->GetMeshName();
};
- if (myContextMap[GetCurrentStudyID()]._mesIterations.size() > 0)
+ if (myStudyContext._mesIterations.size() > 0)
{
MESSAGE (". Ecritures des iterations");
aScript += "#\n# Creation of the iterations" ;
aScript += "\n# ==========================";
}
std::map<std::string, HOMARD::HOMARD_Iteration_var>::const_iterator it_iter;
- for (it_iter = myContextMap[GetCurrentStudyID()]._mesIterations.begin();
- it_iter != myContextMap[GetCurrentStudyID()]._mesIterations.end(); ++it_iter)
+ for (it_iter = myStudyContext._mesIterations.begin();
+ it_iter != myStudyContext._mesIterations.end(); ++it_iter)
{
HOMARD::HOMARD_Iteration_var aIter = (*it_iter).second;
CORBA::String_var dumpCorbaIter = aIter->GetDumpPython();
}
- if (myContextMap[GetCurrentStudyID()]._mesYACSs.size() > 0)
+ if (myStudyContext._mesYACSs.size() > 0)
{
MESSAGE (". Ecritures des schemas YACS");
aScript += "#\n# Creation of the schemas YACS";
aScript += "\n# ============================";
}
std::map<std::string, HOMARD::HOMARD_YACS_var>::const_iterator it_yacs;
- for ( it_yacs = myContextMap[GetCurrentStudyID()]._mesYACSs.begin();
- it_yacs != myContextMap[GetCurrentStudyID()]._mesYACSs.end(); ++it_yacs)
+ for ( it_yacs = myStudyContext._mesYACSs.begin();
+ it_yacs != myStudyContext._mesYACSs.end(); ++it_yacs)
{
HOMARD::HOMARD_YACS_var myYACS = (*it_yacs).second;
CORBA::String_var dumpCorbaYACS = myYACS->GetDumpPython();
void HOMARD_Gen_i::IsValidStudy( )
{
// MESSAGE( "IsValidStudy" );
- if (CORBA::is_nil(myCurrentStudy))
+ if (CORBA::is_nil(myStudy))
{
SALOME::ExceptionStruct es;
es.type = SALOME::BAD_PARAM;
{
std::string casename = std::string("") ;
std::map<std::string, HOMARD::HOMARD_Cas_var>::const_iterator it;
- for (it = myContextMap[GetCurrentStudyID()]._mesCas.begin();
- it != myContextMap[GetCurrentStudyID()]._mesCas.end(); it++)
+ for (it = myStudyContext._mesCas.begin();
+ it != myStudyContext._mesCas.end(); it++)
{
if (std::string(nomDir) == std::string(it->second->GetDirName()))
{
if ( ok )
{
std::string PrefFile ;
- PrefFile = getenv("HOME") ;
+ PrefFile = Kernel_Utils::HomePath() ;
PrefFile += "/.config/salome/SalomeApprc." + salome_version ;
MESSAGE ( "PrefFile = "<<PrefFile ) ;
return _YACSTypeTest ;
}
-//=============================================================================
-extern "C"
-{
- HOMARDENGINE_EXPORT
- PortableServer::ObjectId* HOMARDEngine_factory(CORBA::ORB_ptr orb,
- PortableServer::POA_ptr poa,
- PortableServer::ObjectId* contId,
- const char* instanceName,
- const char* interfaceName)
- {
- MESSAGE("PortableServer::ObjectId* HOMARDEngine_factory()");
- HOMARD_Gen_i* myHOMARD_Gen = new HOMARD_Gen_i(orb, poa, contId, instanceName, interfaceName);
- return myHOMARD_Gen->getId();
- }
-}