-// Copyright (C) 2011-2012 CEA/DEN, EDF R&D
+// Copyright (C) 2011-2020 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
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
#include CORBA_SERVER_HEADER(HOMARD_Iteration)
#include CORBA_SERVER_HEADER(HOMARD_Zone)
#include CORBA_SERVER_HEADER(HOMARD_Boundary)
+#include CORBA_SERVER_HEADER(HOMARD_YACS)
#include CORBA_CLIENT_HEADER(SALOMEDS)
#include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
+#include "HOMARD_i.hxx"
#include "HOMARD_Gen.hxx"
#include "HomardDriver.hxx"
+#include "YACSDriver.hxx"
+#include "FrontTrack.hxx"
#include "SALOME_Component_i.hxx"
#include "SALOME_NamingService.hxx"
#include "Utils_CorbaException.hxx"
-
#include <string>
#include <map>
-class HOMARD_Gen_i:
- public virtual Engines_Component_i,
- public virtual POA_HOMARD::HOMARD_Gen
+class HOMARDENGINE_EXPORT HOMARD_Gen_i : public Engines_Component_i, public POA_HOMARD::HOMARD_Gen
{
public:
HOMARD_Gen_i( CORBA::ORB_ptr orb,
PortableServer::POA_ptr poa,
PortableServer::ObjectId* contId,
const char* instanceName,
- const char* interfaceName );
+ const char* interfaceName,
+ bool checkNS);
virtual ~HOMARD_Gen_i();
// Les creations
HOMARD::HOMARD_Boundary_ptr CreateBoundary (const char* nomBoundary, CORBA::Long typeBoundary);
+ HOMARD::HOMARD_Boundary_ptr CreateBoundaryCAO(const char* nomBoundary,
+ const char* DataFile);
HOMARD::HOMARD_Boundary_ptr CreateBoundaryDi (const char* nomBoundary,
- const char* MeshName, const char* FileName);
+ const char* MeshName, const char* DataFile);
HOMARD::HOMARD_Boundary_ptr CreateBoundaryCylinder (const char* nomBoundary,
CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre,
CORBA::Double Xaxis, CORBA::Double Yaxis, CORBA::Double Zaxis,
HOMARD::HOMARD_Boundary_ptr CreateBoundarySphere (const char* nomBoundary,
CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre,
CORBA::Double Rayon);
+ HOMARD::HOMARD_Boundary_ptr CreateBoundaryConeR (const char* nomBoundary,
+ CORBA::Double Xcentre1, CORBA::Double Ycentre1, CORBA::Double Zcentre1, CORBA::Double Rayon1,
+ CORBA::Double Xcentre2, CORBA::Double Ycentre2, CORBA::Double Zcentre2, CORBA::Double Rayon2);
+ HOMARD::HOMARD_Boundary_ptr CreateBoundaryConeA (const char* nomBoundary,
+ CORBA::Double Xaxis, CORBA::Double Yaxis, CORBA::Double Zaxis, CORBA::Double Angle,
+ CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre);
+ HOMARD::HOMARD_Boundary_ptr CreateBoundaryTorus (const char* nomBoundary,
+ CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre,
+ CORBA::Double Xaxis, CORBA::Double Yaxis, CORBA::Double Zaxis,
+ CORBA::Double RayonRev, CORBA::Double RayonPri);
- HOMARD::HOMARD_Cas_ptr CreateCase (const char* nomCas,
- const char* MeshName, const char* FileName);
+ HOMARD::HOMARD_Cas_ptr CreateCase (const char* nomCas, const char* MeshName, const char* FileName);
+ HOMARD::HOMARD_Cas_ptr CreateCaseFromIteration (const char* nomCas, const char* DirNameStart);
+ HOMARD::HOMARD_Cas_ptr CreateCaseFromCaseLastIteration (const char* nomCas, const char* DirNameStart);
+ HOMARD::HOMARD_Cas_ptr CreateCaseFromCaseIteration (const char* nomCas, const char* DirNameStart, CORBA::Long Number);
+ HOMARD::HOMARD_Cas_ptr CreateCase0 (const char* nomCas, const char* MeshName, const char* FileName, CORBA::Long MeshOption, CORBA::Long NumeIter, CORBA::Long Option);
+ std::string CreateCase1 (const char* DirNameStart, CORBA::Long Number);
HOMARD::HOMARD_Hypothesis_ptr CreateHypothesis(const char* nomHypothesis);
HOMARD::HOMARD_Cas_ptr GetCase (const char* nomCas);
HOMARD::HOMARD_Hypothesis_ptr GetHypothesis (const char* nomHypothesis);
HOMARD::HOMARD_Iteration_ptr GetIteration (const char* nomIteration);
+ HOMARD::HOMARD_YACS_ptr GetYACS (const char* nomYACS);
HOMARD::HOMARD_Zone_ptr GetZone (const char* nomZone);
HOMARD::listeBoundarys* GetAllBoundarysName();
HOMARD::listeCases* GetAllCasesName();
HOMARD::listeHypotheses* GetAllHypothesesName();
HOMARD::listeIterations* GetAllIterationsName();
+ HOMARD::listeYACSs* GetAllYACSsName();
HOMARD::listeZones* GetAllZonesName();
void MeshInfo (const char* nomCas,
HOMARD::HOMARD_Iteration_ptr LastIteration (const char* nomCas);
// L'etude
- SALOMEDS::Study_ptr GetCurrentStudy();
- void SetCurrentStudy(SALOMEDS::Study_ptr theStudy);
- CORBA::Long GetCurrentStudyID();
+ void UpdateStudy();
+ void IsValidStudy();
// Liens entre structures
void InvalideBoundary(const char* nomBoundary);
void InvalideIter(const char* nomIter);
void InvalideIterOption(const char* nomIter, CORBA::Long Option);
void InvalideIterInfo(const char* nomIter);
+ void InvalideYACS(const char* nomYACS);
void InvalideZone(const char* nomZone);
CORBA::Long DeleteBoundary(const char* nomBoundary);
- CORBA::Long DeleteCase(const char* nomCas);
+ CORBA::Long DeleteCase(const char* nomCas, CORBA::Long Option);
CORBA::Long DeleteHypo(const char* nomHypothesis);
CORBA::Long DeleteIteration(const char* nomIter, CORBA::Long Option);
CORBA::Long DeleteIterationOption(const char* nomIter, CORBA::Long Option1, CORBA::Long Option2);
+ CORBA::Long DeleteYACS(const char* nomYACS, CORBA::Long Option);
CORBA::Long DeleteZone(const char* nomZone);
void AssociateIterHypo(const char* nomIter, const char* nomHypothesis);
void AssociateCaseIter(const char* nomCas, const char* nomIter,
const char* labelIter);
- void SetEtatIter(const char* nomIter,const CORBA::Boolean EtatCalcul);
+// Actions
+ void SetEtatIter(const char* nomIter,const CORBA::Long Etat);
+ char* CreateDirNameIter(const char* nomrep, CORBA::Long num );
- CORBA::Long Compute(const char* nomIteration, CORBA::Long etatMenage, CORBA::Long modeHOMARD, CORBA::Long Option);
- CORBA::Long ComputeAdap(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOMARD_Iteration_var myIteration, CORBA::Long etatMenage, HomardDriver* myDriver, CORBA::Long Option);
- char* ComputeDir(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOMARD_Iteration_var myIteration, CORBA::Long etatMenage);
- char* ComputeDirPa(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOMARD_Iteration_var myIteration);
+ CORBA::Long Compute(const char* nomIteration, CORBA::Long etatMenage, CORBA::Long modeHOMARD, CORBA::Long Option1, CORBA::Long Option2);
+ CORBA::Long ComputeAdap(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOMARD_Iteration_var myIteration, CORBA::Long etatMenage, HomardDriver* myDriver, CORBA::Long Option1, CORBA::Long Option2);
+ CORBA::Long ComputeCAO(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOMARD_Iteration_var myIteration, CORBA::Long Option1, CORBA::Long Option2);
+ CORBA::Long ComputeCAObis(HOMARD::HOMARD_Iteration_var myIteration, CORBA::Long Option1, CORBA::Long Option2);
+ char* ComputeDirManagement(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOMARD_Iteration_var myIteration, CORBA::Long etatMenage);
+ char* ComputeDirPaManagement(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOMARD_Iteration_var myIteration);
void DriverTexteZone(HOMARD::HOMARD_Hypothesis_var myHypo, HomardDriver* myDriver);
void DriverTexteField(HOMARD::HOMARD_Iteration_var myIteration, HOMARD::HOMARD_Hypothesis_var myHypo, HomardDriver* myDriver);
- void DriverTexteBoundary(HOMARD::HOMARD_Cas_var myCase, HomardDriver* myDriver);
+ int DriverTexteBoundary(HOMARD::HOMARD_Cas_var myCase, HomardDriver* myDriver);
void DriverTexteFieldInterp(HOMARD::HOMARD_Iteration_var myIteration, HOMARD::HOMARD_Hypothesis_var myHypo, HomardDriver* myDriver);
- CORBA::Boolean VerifieDir(const char* nomDir);
+ char* VerifieDir(const char* nomDir);
- void PublishResultInSmesh(const char* NomFich, CORBA::Long Option);
- void DeleteResultInSmesh(const char* NomFich, const char* MeshName);
- void PublishFileUnderIteration(const char* NomIter, const char* NomFich,
- const char* Commentaire);
+ void PublishFileUnderIteration(const char* NomIter, const char* NomFich, const char* Commentaire);
+ void PublishFileUnderYACS(const char* NomYACS, const char* NomFich, const char* Commentaire);
void PublishBoundaryUnderCase(const char* CaseName, const char* BoundaryName);
+ void PublishCaseUnderYACS(const char* YACSName, const char* CaseName);
+ void PublishResultInSmesh(const char* NomFich, CORBA::Long Option);
+ void DeleteResultInSmesh(std::string NomFich, std::string MeshName);
+ void PublishMeshIterInSmesh(const char* NomIter);
+
+// YACS
+ HOMARD::HOMARD_YACS_ptr CreateYACSSchema (const char* YACSName, const char* nomCas, const char* ScriptFile, const char* DirName, const char* MeshFile);
+ CORBA::Long YACSWrite(const char* nomYACS);
+ CORBA::Long YACSWriteOnFile(const char* nomYACS, const char* XMLFile);
+ std::string YACSDriverTexteZone(HOMARD::HOMARD_Hypothesis_var myHypo, YACSDriver* myDriver);
+ std::string YACSDriverTexteBoundary(HOMARD::HOMARD_Cas_var myCase, YACSDriver* myDriver);
+
+// Preferences
+ void SetPreferences() ;
+ void SetLanguageShort(const char* LanguageShort);
+ char* GetLanguageShort();
+ void SetPublisMesh(CORBA::Long PublisMeshIN, CORBA::Long PublisMeshOUT);
+ CORBA::Long GetPublisMeshIN();
+ CORBA::Long GetPublisMeshOUT();
+ void SetYACSMaximum(CORBA::Long YACSMaxIter, CORBA::Long YACSMaxNode, CORBA::Long YACSMaxElem);
+ CORBA::Long GetYACSMaxIter();
+ CORBA::Long GetYACSMaxNode();
+ CORBA::Long GetYACSMaxElem();
+ void SetYACSConvergenceType(CORBA::Long YACSTypeTest);
+ CORBA::Long GetYACSConvergenceType();
- void IsValidStudy();
// ---------------------------------------------------------------
// next functions are inherited from SALOMEDS::Driver interface
// --> Data publishing
virtual CORBA::Boolean CanPublishInStudy(CORBA::Object_ptr theIOR);
- virtual SALOMEDS::SObject_ptr PublishInStudy(SALOMEDS::Study_ptr theStudy,
- SALOMEDS::SObject_ptr theSObject,
+ virtual SALOMEDS::SObject_ptr PublishInStudy(SALOMEDS::SObject_ptr theSObject,
CORBA::Object_ptr theObject,
const char* theName);
// virtual void SALOMEException( std::string message );
private:
- void addInStudy(SALOMEDS::Study_ptr theStudy);
- SALOMEDS::SObject_ptr PublishCaseInStudy(SALOMEDS::Study_ptr theStudy, SALOMEDS::StudyBuilder_var aStudyBuilder,
+ SALOMEDS::SObject_ptr PublishBoundaryInStudy(SALOMEDS::StudyBuilder_var aStudyBuilder,
+ HOMARD::HOMARD_Boundary_ptr theObject, const char* theName);
+ SALOMEDS::SObject_ptr PublishCaseInStudy(SALOMEDS::StudyBuilder_var aStudyBuilder,
HOMARD::HOMARD_Cas_ptr theObject, const char* theName);
-
- SALOMEDS::SObject_ptr PublishHypotheseInStudy(SALOMEDS::Study_ptr theStudy, SALOMEDS::StudyBuilder_var aStudyBuilder,
+ SALOMEDS::SObject_ptr PublishHypotheseInStudy(SALOMEDS::StudyBuilder_var aStudyBuilder,
HOMARD::HOMARD_Hypothesis_ptr theObject, const char* theName);
-
- SALOMEDS::SObject_ptr PublishZoneInStudy(SALOMEDS::Study_ptr theStudy, SALOMEDS::StudyBuilder_var aStudyBuilder,
+ SALOMEDS::SObject_ptr PublishYACSInStudy(SALOMEDS::StudyBuilder_var aStudyBuilder,
+ HOMARD::HOMARD_YACS_ptr theObject, const char* theName);
+ SALOMEDS::SObject_ptr PublishZoneInStudy(SALOMEDS::StudyBuilder_var aStudyBuilder,
HOMARD::HOMARD_Zone_ptr theObject, const char* theName);
- SALOMEDS::SObject_ptr PublishBoundaryInStudy(SALOMEDS::Study_ptr theStudy, SALOMEDS::StudyBuilder_var aStudyBuilder,
- HOMARD::HOMARD_Boundary_ptr theObject, const char* theName);
virtual void PublishInStudyAttr(SALOMEDS::StudyBuilder_var aStudyBuilder,
SALOMEDS::SObject_var aResultSO,
- const char* theName, const char* value, const char* icone, const char* ior);
+ const char* theName, const char* comment, const char* icone, const char* ior);
-PortableServer::ServantBase_var GetServant(CORBA::Object_ptr theObject);
+ PortableServer::ServantBase_var GetServant(CORBA::Object_ptr theObject);
+ HOMARD::HOMARD_Boundary_ptr newBoundary();
HOMARD::HOMARD_Cas_ptr newCase();
HOMARD::HOMARD_Hypothesis_ptr newHypothesis();
HOMARD::HOMARD_Iteration_ptr newIteration();
+ HOMARD::HOMARD_YACS_ptr newYACS();
HOMARD::HOMARD_Zone_ptr newZone();
- HOMARD::HOMARD_Boundary_ptr newBoundary();
- virtual Engines::TMPFile* DumpPython(CORBA::Object_ptr theStudy,
- CORBA::Boolean isPublished,
- CORBA::Boolean isMultiFile,
- CORBA::Boolean& isValidScript);
+ virtual Engines::TMPFile* DumpPython(CORBA::Boolean isPublished,
+ CORBA::Boolean isMultiFile,
+ CORBA::Boolean& isValidScript);
virtual char* getVersion();
+ std::string GetStringInTexte( const std::string Texte, const std::string String, int option ) ;
private:
struct StudyContext
{
+ std::map<std::string, HOMARD::HOMARD_Boundary_var> _mesBoundarys;
std::map<std::string, HOMARD::HOMARD_Cas_var> _mesCas;
std::map<std::string, HOMARD::HOMARD_Hypothesis_var> _mesHypotheses;
std::map<std::string, HOMARD::HOMARD_Iteration_var> _mesIterations;
+ std::map<std::string, HOMARD::HOMARD_YACS_var> _mesYACSs;
std::map<std::string, HOMARD::HOMARD_Zone_var> _mesZones;
- std::map<std::string, HOMARD::HOMARD_Boundary_var> _mesBoundarys;
std::map<int, PortableServer::ServantBase*> _idmap;
};
- typedef std::map<int, StudyContext> ContextMap;
::HOMARD_Gen* myHomard;
- SALOMEDS::Study_var myCurrentStudy;
- ContextMap myContextMap;
+ StudyContext myStudyContext;
SALOME_NamingService* _NS;
+ int _tag_gene ;
+ int _tag_boun ;
+ int _tag_hypo ;
+ int _tag_yacs ;
+ int _tag_zone ;
+
+// Preferences
+ std::string _Langue ;
+ std::string _LangueShort ;
+ int _PublisMeshIN ;
+ int _PublisMeshOUT ;
+ int _YACSMaxIter ;
+ int _YACSMaxNode ;
+ int _YACSMaxElem ;
+ int _YACSTypeTest ;
+protected:
+ SALOMEDS::Study_var myStudy;
};
#endif
