From: prascle Date: Fri, 21 Oct 2011 16:02:04 +0000 (+0000) Subject: PR: from Gerald Nicolas, 20 oct 2011 X-Git-Tag: V6_4_0a1~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c66b36f7ba7b9ae61d737319f23a75943c52d4d0;p=modules%2Fhomard.git PR: from Gerald Nicolas, 20 oct 2011 --- diff --git a/doc/files/tutorial_1.py b/doc/files/tutorial_1.py index f5a01696..33d3ad90 100644 --- a/doc/files/tutorial_1.py +++ b/doc/files/tutorial_1.py @@ -24,7 +24,7 @@ Exemple de couplage HOMARD-Salome Copyright EDF-R&D 1996, 2010 """ -__revision__ = "V1.1" +__revision__ = "V1.2" # # ================================== # Repertoire a personnaliser @@ -46,34 +46,34 @@ homard.SetCurrentStudy(salome.myStudy) Hypo_0 = homard.CreateHypothesis('Hypo_0') Hypo_0.SetAdapRefinUnRef(-1, 1, 0) # -# Case "Case_0" +# Case "Case_1" # ============= -Case_0 = homard.CreateCase('Case_0', 'MAILL', dircase+'/tutorial_1.00.med') -Case_0.SetDirName(dircase) -Case_0.SetConfType(1) +Case_1 = homard.CreateCase('Case_1', 'MAILL', dircase+'/tutorial_1.00.med') +Case_1.SetDirName(dircase) +Case_1.SetConfType(1) # # Iterations # ========== # Iteration "Iter_0" -Iter_0 = homard.CreateIteration('Iter_0', Case_0.GetIter0Name()) +Iter_0 = homard.CreateIteration('Iter_0', Case_1.GetIter0Name()) Iter_0.SetMeshName('MESH') Iter_0.SetMeshFile(dircase+'/maill.01.med') homard.AssociateIterHypo('Iter_0', 'Hypo_0') -codret = homard.Compute('Iter_0', 1) +codret = Iter_0.Compute(1) # Iteration "Iter_1" Iter_1 = homard.CreateIteration('Iter_1', 'Iter_0') Iter_1.SetMeshName('MESH') Iter_1.SetMeshFile(dircase+'/maill.02.med') homard.AssociateIterHypo('Iter_1', 'Hypo_0') -codret = homard.Compute('Iter_1', 1) +codret = Iter_1.Compute(1) # Iteration "Iter_2" Iter_2 = homard.CreateIteration('Iter_2', 'Iter_1') Iter_2.SetMeshName('MESH') Iter_2.SetMeshFile(dircase+'/maill.03.med') homard.AssociateIterHypo('Iter_2', 'Hypo_0') -codret = homard.Compute('Iter_2', 1) +codret = Iter_2.Compute(1) if salome.sg.hasDesktop(): salome.sg.updateObjBrowser(1) diff --git a/doc/files/tutorial_2.py b/doc/files/tutorial_2.py index ed0f62c7..25ec4357 100644 --- a/doc/files/tutorial_2.py +++ b/doc/files/tutorial_2.py @@ -24,7 +24,7 @@ Exemple de couplage HOMARD-Salome Copyright EDF-R&D 1996, 2010 """ -__revision__ = "V1.2" +__revision__ = "V1.3" # # ================================== # Repertoire a personnaliser @@ -66,18 +66,18 @@ Hypo_1.SetAdapRefinUnRef(0, 1, 0) homard.AssociateHypoZone('Zone_0', 'Hypo_1') homard.AssociateHypoZone('Zone_2', 'Hypo_1') # -# Case "Case_0" +# Case "Case_1" # ============= -Case_0 = homard.CreateCase('Case_0', 'MZERO', dircase+'/tutorial_2.00.med') -Case_0.SetDirName(dircase) +Case_1 = homard.CreateCase('Case_1', 'MZERO', dircase+'/tutorial_2.00.med') +Case_1.SetDirName(dircase) # # Iteration "Iter_0" # ================== -Iter_0 = homard.CreateIteration('Iter_0', Case_0.GetIter0Name()) +Iter_0 = homard.CreateIteration('Iter_0', Case_1.GetIter0Name()) Iter_0.SetMeshName('M_1') Iter_0.SetMeshFile(dircase+'/maill.01.med') homard.AssociateIterHypo('Iter_0', 'Hypo_0') -codret = homard.Compute('Iter_0', 1) +codret = Iter_0.Compute(1) # # Iteration "Iter_1" # ================== @@ -85,7 +85,7 @@ Iter_1 = homard.CreateIteration('Iter_1', 'Iter_0') Iter_1.SetMeshName('M_2') Iter_1.SetMeshFile(dircase+'/maill.02.med') homard.AssociateIterHypo('Iter_1', 'Hypo_1') -codret = homard.Compute('Iter_1', 1) +codret = Iter_1.Compute(1) if salome.sg.hasDesktop(): salome.sg.updateObjBrowser(1) diff --git a/doc/files/tutorial_3.py b/doc/files/tutorial_3.py index 7b010bc3..006cf3b0 100644 --- a/doc/files/tutorial_3.py +++ b/doc/files/tutorial_3.py @@ -24,7 +24,7 @@ Exemple de couplage HOMARD-Salome Copyright EDF-R&D 1996, 2010 """ -__revision__ = "V1.2" +__revision__ = "V1.3" # # ================================== # Repertoire a personnaliser @@ -95,7 +95,7 @@ Iter_1.SetMeshFile(dircase+'/maill.01.med') Iter_1.SetFieldFile(dircase+'/tutorial_3.00.med') Iter_1.SetTimeStepRank( 1, 1) homard.AssociateIterHypo('Iter_1', 'Hypo_0vers1') -codret = homard.Compute('Iter_1', 1) +codret = Iter_1.Compute(1) # # Iteration "Iter_2" # ================== @@ -105,7 +105,7 @@ Iter_2.SetMeshFile(dircase+'/maill.02.med') Iter_2.SetFieldFile(dircase+'/tutorial_3.01.med') Iter_2.SetTimeStepRank(1, 1) homard.AssociateIterHypo('Iter_2', 'Hypo_1vers2') -codret = homard.Compute('Iter_2', 1) +codret = Iter_2.Compute(1) # # Iteration "Iter_2_bis" # ====================== @@ -115,7 +115,7 @@ Iter_2_bis.SetMeshFile(dircase+'/maill.02.bis.med') Iter_2_bis.SetFieldFile(dircase+'/tutorial_3.01.med') Iter_2_bis.SetTimeStepRank(1, 1) homard.AssociateIterHypo('Iter_2_bis', 'Hypo_1vers2_bis') -codret = homard.Compute('Iter_2_bis', 1) +codret = Iter_2_bis.Compute(1) # if salome.sg.hasDesktop(): salome.sg.updateObjBrowser(1) diff --git a/doc/files/tutorial_4.py b/doc/files/tutorial_4.py index 9ca58731..90ba82a7 100644 --- a/doc/files/tutorial_4.py +++ b/doc/files/tutorial_4.py @@ -24,7 +24,7 @@ Exemple de couplage HOMARD-Salome Copyright EDF-R&D 1996, 2011 """ -__revision__ = "V1.2" +__revision__ = "V1.3" # # ================================== # Repertoire a personnaliser @@ -87,13 +87,13 @@ Iter_1 = homard.CreateIteration('Iter_1', Case.GetIter0Name() ) Iter_1.SetMeshName('PIQUAGE_1') Iter_1.SetMeshFile(dircase+'/maill.01.med') homard.AssociateIterHypo('Iter_1', 'Hypo_1') -codret = homard.Compute('Iter_1', 1) +codret = Iter_1.Compute(1) # Creation of the iteration Iter_2 Iter_2 = homard.CreateIteration('Iter_2', 'Iter_1' ) Iter_2.SetMeshName('PIQUAGE_2') Iter_2.SetMeshFile(dircase+'/maill.02.med') homard.AssociateIterHypo('Iter_2', 'Hypo_2') -codret = homard.Compute('Iter_2', 1) +codret = Iter_2.Compute(1) if salome.sg.hasDesktop(): salome.sg.updateObjBrowser(1) diff --git a/doc/files/tutorial_5.py b/doc/files/tutorial_5.py index 6f2a6d10..fd9857d8 100644 --- a/doc/files/tutorial_5.py +++ b/doc/files/tutorial_5.py @@ -24,7 +24,7 @@ Exemple de couplage HOMARD-Salome Copyright EDF-R&D 1996, 2010 """ -__revision__ = "V1.1" +__revision__ = "V1.2" # # ================================== # Repertoire a personnaliser @@ -77,7 +77,7 @@ Iter_1 = homard.CreateIteration('Iter_1', Case_1.GetIter0Name()) Iter_1.SetMeshName('COEUR_2D_01') Iter_1.SetMeshFile(dircase+'/maill.01.med') homard.AssociateIterHypo('Iter_1', 'Hypo_1') -codret = homard.Compute('Iter_1', 1) +codret = Iter_1.Compute(1) # # Iteration "Iter_2" # ================== @@ -85,7 +85,7 @@ Iter_2 = homard.CreateIteration('Iter_2', 'Iter_1') Iter_2.SetMeshName('COEUR_2D_02') Iter_2.SetMeshFile(dircase+'/maill.02.med') homard.AssociateIterHypo('Iter_2', 'Hypo_2') -result = homard.Compute('Iter_2', 1) +codret = Iter_2.Compute(1) if salome.sg.hasDesktop(): diff --git a/doc/gui_homard.rst b/doc/gui_homard.rst index 406b173d..9952cd9a 100644 --- a/doc/gui_homard.rst +++ b/doc/gui_homard.rst @@ -40,5 +40,5 @@ Les deux fichiers de texte, Liste.n.vers.(n+1) et apad.n.vers.(n+1).bilan, sont Méthodes python correspondantes """"""""""""""""""""""""""""""" -Consulter :ref:`tui_homard` +Consulter :ref:`tui_create_iteration` diff --git a/doc/tui_create_boundary.rst b/doc/tui_create_boundary.rst index 73c65404..9b2992b1 100644 --- a/doc/tui_create_boundary.rst +++ b/doc/tui_create_boundary.rst @@ -71,7 +71,7 @@ M Exemple """"""" -Création d'une frontière discrète, d'une frontière sphérique, puis d'une frontière cylindrique : :: +Création d'une frontière discrète, d'une frontière sphèrique, puis d'une frontière cylindrique : :: inter = homard.CreateBoundaryDi("INTERSECTION", 'PIQUAGE', dircase+'/tutorial_4.fr.med') fron_1 = homard.CreateBoundarySphere("FRON_1", 12.3, 3.4, .56, 6.5) diff --git a/doc/tui_create_case.rst b/doc/tui_create_case.rst index 025521cd..393fcd9a 100644 --- a/doc/tui_create_case.rst +++ b/doc/tui_create_case.rst @@ -12,7 +12,7 @@ M """""""""""""""""""""""""""" +---------------------------------------------------------------+ -+===============================================================+ ++---------------------------------------------------------------+ | .. module:: CreateCase | | | | **CreateCase(case_name, mesh_name, mesh_file)** | @@ -33,7 +33,7 @@ M """"""""""""""""""""""""" +---------------------------------------------------------------+ -+===============================================================+ ++---------------------------------------------------------------+ | .. module:: GetName | | | | **GetName()** | diff --git a/doc/tui_create_iteration.rst b/doc/tui_create_iteration.rst index 2844ded6..776aecc9 100644 --- a/doc/tui_create_iteration.rst +++ b/doc/tui_create_iteration.rst @@ -42,6 +42,21 @@ G +---------------------------------------------------------------+ +---------------------------------------------------------------+ +| .. index:: single: Compute | +| | +| **Compute(option)** | +| Calcule le maillage correspondant à l'itération | +| | +| - ``option`` : un entier précisant ce qui se passe quand | +| des fichiers de résultats existent déjà | +| | +| * 0 : arrêt en erreur | +| * 1 : écrasement des anciens fichiers | +| | +| Retourne un entier : | +| * 0 : adaptation réussie | +| * autre valeur : problème | ++---------------------------------------------------------------+ | .. module:: GetName | | | | **GetName()** | @@ -145,15 +160,17 @@ Pour la cr iter_1.SetMeshName("maill_01") iter_1.SetMeshFile("/local00/M.01.med") homard.AssociateIterHypo(iter_name, "HypoField") + codret = iter_1.Compute(1) Pour la création d'une itération suivante, on donnera le nom de l'itération parent de laquelle on part. :: iter_name = "Iteration_2" - iter_1 = homard.CreateIteration(iter_name, "Iteration_1") - iter_1.SetField(field_file, 0, 0) - iter_1.SetMeshName("maill_02") - iter_1.SetMeshFile("/local00/M.02.med") + iter_2 = homard.CreateIteration(iter_name, "Iteration_1") + iter_2.SetField(field_file, 0, 0) + iter_2.SetMeshName("maill_02") + iter_2.SetMeshFile("/local00/M.02.med") homard.AssociateIterHypo(iter_name, "HypoField") + codret = iter_2.Compute(1) Saisie graphique correspondante diff --git a/doc/tui_homard.rst b/doc/tui_homard.rst index 9fbe16c6..5727d981 100644 --- a/doc/tui_homard.rst +++ b/doc/tui_homard.rst @@ -2,39 +2,14 @@ Le calcul ========= -.. index:: single: itération -.. index:: single: calcul Méthodes de la classe homard """""""""""""""""""""""""""" -+---------------------------------------------------------------+ -+---------------------------------------------------------------+ -| .. index:: single: Compute | -| | -| **Compute(iter_name, option)** | -| Calcule l'adaptation de maillage correspondant à | -| une itération | -| | -| - ``iter_name`` : le nom de l'itération | -| - ``option`` : un entier précisant ce qui se passe quand | -| des fichiers de résultats existent déjà | -| | -| * 0 : arrêt en erreur | -| * 1 : écrasement des anciens fichiers | -| | -| Retourne un entier : | -| * 0 : adaptation réussie | -| * autre valeur : problème | -+---------------------------------------------------------------+ - Exemple """"""" -Le calcul de l'itération de nom "Iteration_1" avec écrasement des anciens fichiers de résultat se fait ainsi : :: - iter_name = "Iteration_1" - codret = homard.Compute(iter_name, 1) Saisie graphique correspondante """"""""""""""""""""""""""""""" diff --git a/doc/tutorials.rst b/doc/tutorials.rst index 8dbd7bdb..3662308e 100644 --- a/doc/tutorials.rst +++ b/doc/tutorials.rst @@ -22,34 +22,34 @@ On fera ici trois raffinements uniformes successifs du maillage contenu dans le Hypo_0 = homard.CreateHypothesis('Hypo_0') Hypo_0.SetAdapRefinUnRef(-1, 1, 0) # - # Case "Case_0" + # Case "Case_1" # ============= - Case_0 = homard.CreateCase('Case_0', 'MAILL', dircase+'/tutorial_1.00.med') - Case_0.SetDirName(dircase) - Case_0.SetConfType(1) + Case_1 = homard.CreateCase('Case_1', 'MAILL', dircase+'/tutorial_1.00.med') + Case_1.SetDirName(dircase) + Case_1.SetConfType(1) # # Iterations # ========== # Iteration "Iter_0" - Iter_0 = homard.CreateIteration('Iter_0', Case_0.GetIter0Name()) + Iter_0 = homard.CreateIteration('Iter_0', Case_1.GetIter0Name()) Iter_0.SetMeshName('MESH') Iter_0.SetMeshFile(dircase+'/maill.01.med') homard.AssociateIterHypo('Iter_0', 'Hypo_0') - codret = homard.Compute('Iter_0', 1) + codret = Iter_0.Compute(1) # Iteration "Iter_1" Iter_1 = homard.CreateIteration('Iter_1', 'Iter_0') Iter_1.SetMeshName('MESH') Iter_1.SetMeshFile(dircase+'/maill.02.med') homard.AssociateIterHypo('Iter_1', 'Hypo_0') - codret = homard.Compute('Iter_1', 1) + codret = Iter_1.Compute(1) # Iteration "Iter_2" Iter_2 = homard.CreateIteration('Iter_2', 'Iter_1') Iter_2.SetMeshName('MESH') Iter_2.SetMeshFile(dircase+'/maill.03.med') homard.AssociateIterHypo('Iter_2', 'Hypo_0') - codret = homard.Compute('Iter_2', 1) + codret = Iter_2.Compute(1) .. note:: Téléchargement des fichiers @@ -92,18 +92,18 @@ On proc homard.AssociateHypoZone('Zone_0', 'Hypo_1') homard.AssociateHypoZone('Zone_2', 'Hypo_1') # - # Case "Case_0" + # Case "Case_1" # ============= - Case_0 = homard.CreateCase('Case_0', 'MZERO', dircase+'/tutorial_2.00.med') - Case_0.SetDirName(dircase) + Case_1 = homard.CreateCase('Case_1', 'MZERO', dircase+'/tutorial_2.00.med') + Case_1.SetDirName(dircase) # # Iteration "Iter_0" # ================== - Iter_0 = homard.CreateIteration('Iter_0', Case_0.GetIter0Name()) + Iter_0 = homard.CreateIteration('Iter_0', Case_1.GetIter0Name()) Iter_0.SetMeshName('M_1') Iter_0.SetMeshFile(dircase+'/maill.01.med') homard.AssociateIterHypo('Iter_0', 'Hypo_0') - codret = homard.Compute('Iter_0', 1) + codret = Iter_0.Compute(1) # # Iteration "Iter_1" # ================== @@ -111,7 +111,7 @@ On proc Iter_1.SetMeshName('M_2') Iter_1.SetMeshFile(dircase+'/maill.02.med') homard.AssociateIterHypo('Iter_1', 'Hypo_1') - codret = homard.Compute('Iter_1', 1) + codret = Iter_1.Compute(1) .. note:: Téléchargement des fichiers @@ -184,7 +184,7 @@ Pour adapter le maillage H_1 issu de l'it Iter_1.SetFieldFile(dircase+'/tutorial_3.00.med') Iter_1.SetTimeStepRank( 1, 1) homard.AssociateIterHypo('Iter_1', 'Hypo_0vers1') - codret = homard.Compute('Iter_1', 1) + codret = Iter_1.Compute(1) # # Iteration "Iter_2" # ================== @@ -194,7 +194,7 @@ Pour adapter le maillage H_1 issu de l'it Iter_2.SetFieldFile(dircase+'/tutorial_3.01.med') Iter_2.SetTimeStepRank(1, 1) homard.AssociateIterHypo('Iter_2', 'Hypo_1vers2') - codret = homard.Compute('Iter_2', 1) + codret = Iter_2.Compute(1) # # Iteration "Iter_2_bis" # ====================== @@ -204,7 +204,7 @@ Pour adapter le maillage H_1 issu de l'it Iter_2_bis.SetFieldFile(dircase+'/tutorial_3.01.med') Iter_2_bis.SetTimeStepRank(1, 1) homard.AssociateIterHypo('Iter_2_bis', 'Hypo_1vers2_bis') - codret = homard.Compute('Iter_2_bis', 1) + codret = Iter_2_bis.Compute(1) .. note:: Téléchargement des fichiers @@ -220,7 +220,7 @@ Suivi de fronti On teste ici le suivi des frontières courbes : des frontières analytiques pour décrire les différentes surfaces des tuyaux et une frontière discrète pour décrire les lignes d'intersection des deux tuyaux. Le pilotage du raffinement est le suivant : raffinement uniforme de toutes les mailles contenues dans des groupes désignés. :: - + dircase = "/tmp" # # Creation of the boundaries @@ -269,13 +269,13 @@ On teste ici le suivi des fronti Iter_1.SetMeshName('PIQUAGE_1') Iter_1.SetMeshFile(dircase+'/maill.01.med') homard.AssociateIterHypo('Iter_1', 'Hypo_1') - codret = homard.Compute('Iter_1', 1) + codret = Iter_1.Compute(1) # Creation of the iteration Iter_2 Iter_2 = homard.CreateIteration('Iter_2', 'Iter_1' ) Iter_2.SetMeshName('PIQUAGE_2') Iter_2.SetMeshFile(dircase+'/maill.02.med') homard.AssociateIterHypo('Iter_2', 'Hypo_2') - codret = homard.Compute('Iter_2', 1) + codret = Iter_2.Compute(1) .. note:: Téléchargement des fichiers @@ -331,7 +331,7 @@ Dans le cas pr Iter_1.SetMeshName('COEUR_2D_01') Iter_1.SetMeshFile(dircase+'/maill.01.med') homard.AssociateIterHypo('Iter_1', 'Hypo_1') - codret = homard.Compute('Iter_1', 1) + codret = Iter_1.Compute(1) # # Iteration "Iter_2" # ================== @@ -339,7 +339,7 @@ Dans le cas pr Iter_2.SetMeshName('COEUR_2D_02') Iter_2.SetMeshFile(dircase+'/maill.02.med') homard.AssociateIterHypo('Iter_2', 'Hypo_2') - result = homard.Compute('Iter_2', 1) + codret = Iter_2.Compute(1) .. note:: Téléchargement des fichiers diff --git a/idl/Gen.xml b/idl/Gen.xml new file mode 100644 index 00000000..4902bdf5 --- /dev/null +++ b/idl/Gen.xml @@ -0,0 +1,1107 @@ + + + + + + + + + + + + + + HOMARD + HOMARD + OTHER + HOMARD team - EDF RD + 1.1 + unknown + 1 + 1 + HOMARD_2.png + + + HOMARD + unknown + + + CreateCase + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + CaseName + string + unknown + + + MeshName + string + unknown + + + FileName + string + unknown + + + + + return + HOMARD/HOMARD_Cas + unknown + + + + + + CreateHypothesis + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + HypoName + string + unknown + + + + + return + HOMARD/HOMARD_Hypothesis + unknown + + + + + + CreateIteration + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + IterName + string + unknown + + + PreviousIterName + string + unknown + + + + + return + HOMARD/HOMARD_Iteration + unknown + + + + + + CreateZoneBox + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + ZoneName + string + unknown + + + Xmini + double + unknown + + + Xmaxi + double + unknown + + + Ymini + double + unknown + + + Ymaxi + double + unknown + + + Zmini + double + unknown + + + Zmaxi + double + unknown + + + + + return + HOMARD/HOMARD_Zone + unknown + + + + + + CreateZoneSphere + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + ZoneName + string + unknown + + + Xcentre + double + unknown + + + Ycentre + double + unknown + + + Zcentre + double + unknown + + + Radius + double + unknown + + + + + return + HOMARD/HOMARD_Zone + unknown + + + + + + CreateZoneCylinder + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + ZoneName + string + unknown + + + Xcentre + double + unknown + + + Ycentre + double + unknown + + + Zcentre + double + unknown + + + Xaxis + double + unknown + + + Yaxis + double + unknown + + + Zaxis + double + unknown + + + Radius + double + unknown + + + Height + double + unknown + + + + + return + HOMARD/HOMARD_Zone + unknown + + + + + + CreateZonePipe + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + ZoneName + string + unknown + + + Xcentre + double + unknown + + + Ycentre + double + unknown + + + Zcentre + double + unknown + + + Xaxis + double + unknown + + + Yaxis + double + unknown + + + Zaxis + double + unknown + + + Radius + double + unknown + + + Height + double + unknown + + + InternalRadius + double + unknown + + + + + return + HOMARD/HOMARD_Zone + unknown + + + + + + CreateZoneBox2D + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + ZoneName + string + unknown + + + Umini + double + unknown + + + Umaxi + double + unknown + + + Vmini + double + unknown + + + Vmaxi + double + unknown + + + Orient + long + unknown + + + + + return + HOMARD/HOMARD_Zone + unknown + + + + + + CreateZoneDisk + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + ZoneName + string + unknown + + + Ucentre + double + unknown + + + Vcentre + double + unknown + + + Radius + double + unknown + + + Orient + long + unknown + + + + + return + HOMARD/HOMARD_Zone + unknown + + + + + + CreateZoneDiskWithHole + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + ZoneName + string + unknown + + + Ucentre + double + unknown + + + Vcentre + double + unknown + + + Radius + double + unknown + + + InternalRadius + double + unknown + + + Orient + long + unknown + + + + + return + HOMARD/HOMARD_Zone + unknown + + + + + + CreateBoundaryDi + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + BounName + string + unknown + + + MeshName + string + unknown + + + FileName + string + unknown + + + + + return + HOMARD/HOMARD_Boundary + unknown + + + + + + CreateBoundaryCylinder + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + BounName + string + unknown + + + Xcentre + double + unknown + + + Ycentre + double + unknown + + + Zcentre + double + unknown + + + Xaxis + double + unknown + + + Yaxis + double + unknown + + + Zaxis + double + unknown + + + Radius + double + unknown + + + + + return + HOMARD/HOMARD_Boundary + unknown + + + + + + CreateBoundarySphere + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + BounName + string + unknown + + + Xcentre + double + unknown + + + Ycentre + double + unknown + + + Zcentre + double + unknown + + + Radius + double + unknown + + + + + return + HOMARD/HOMARD_Boundary + unknown + + + + + + AssociateIterHypo + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + IterName + string + unknown + + + HypoName + string + unknown + + + + + + + AssociateHypoZone + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + ZoneName + string + unknown + + + HypoName + string + unknown + + + + + + + GetCaseName + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + IterName + string + unknown + + + + + return + string + unknown + + + + + + GetCas + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + CaseName + string + unknown + + + + + return + HOMARD/HOMARD_Cas + unknown + + + + + + GetBoundary + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + BounName + string + unknown + + + + + return + HOMARD/HOMARD_Boundary + unknown + + + + + + GetZone + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + ZoneName + string + unknown + + + + + return + HOMARD/HOMARD_Zone + unknown + + + + + + GetHypothesis + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + HypoName + string + unknown + + + + + return + HOMARD/HOMARD_Hypothesis + unknown + + + + + + GetIteration + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + IterName + string + unknown + + + + + return + HOMARD/HOMARD_Iteration + unknown + + + + + + GetAllCases + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + + return + HOMARD/listeCases + unknown + + + + + + GetAllBoundarys + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + + return + HOMARD/listeBoundarys + unknown + + + + + + GetAllHypotheses + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + + return + HOMARD/listeHypotheses + unknown + + + + + + GetAllZones + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + + return + HOMARD/listeZones + unknown + + + + + + GetAllIterations + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + + return + HOMARD/listeIterations + unknown + + + + + + SetCurrentStudy + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + theStudy + SALOMEDS/Study + unknown + + + + + + + AssociateIterIter + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + PreviousIterName + string + unknown + + + IterName + string + unknown + + + + + + + DissociateHypoZone + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + ZoneName + string + unknown + + + HypoName + string + unknown + + + + + + + InvalideBoundary + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + BounName + string + unknown + + + + + + + InvalideZone + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + ZoneName + string + unknown + + + + + + + InvalideHypo + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + HypoName + string + unknown + + + + + + + InvalideIter + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + IterName + string + unknown + + + + + + + Compute + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + IterName + string + unknown + + + etatMenage + long + unknown + + + + + return + boolean + unknown + + + + + + VerifieDir + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + IterName + string + unknown + + + + + return + boolean + unknown + + + + + + PublishFileUnderIteration + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + NomIter + string + unknown + + + NomFich + string + unknown + + + Commentaire + string + unknown + + + + + + + PublishResultInSmesh + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + NomFich + string + unknown + + + IconeType + long + unknown + + + + + + + GetCurrentStudy + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + + return + SALOMEDS/Study + unknown + + + + + + GetCurrentStudyID + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + + return + long + unknown + + + + + + + + + diff --git a/idl/HOMARD_Boundary.idl b/idl/HOMARD_Boundary.idl index fa8a0694..3b29b714 100644 --- a/idl/HOMARD_Boundary.idl +++ b/idl/HOMARD_Boundary.idl @@ -20,14 +20,17 @@ #ifndef _HOMARD_Boundary_IDL #define _HOMARD_Boundary_IDL +#include "SALOME_Component.idl" #include "SALOME_Exception.idl" +#include "SALOMEDS.idl" + #include "HOMARD_Cas.idl" #include "HOMARD_Zone.idl" module HOMARD { - interface HOMARD_Boundary + interface HOMARD_Boundary : Engines::EngineComponent { void SetName (in string NomBoundary) raises (SALOME::SALOME_Exception); diff --git a/idl/HOMARD_Cas.idl b/idl/HOMARD_Cas.idl index 85fc70c9..e5099976 100644 --- a/idl/HOMARD_Cas.idl +++ b/idl/HOMARD_Cas.idl @@ -20,7 +20,9 @@ #ifndef _HOMARD_CAS_IDL #define _HOMARD_CAS_IDL +#include "SALOME_Component.idl" #include "SALOME_Exception.idl" +#include "SALOMEDS.idl" module HOMARD { @@ -29,7 +31,7 @@ module HOMARD typedef sequence ListBoundaryGroupType ; - interface HOMARD_Cas + interface HOMARD_Cas : Engines::EngineComponent { void SetName(in string NomCas) raises (SALOME::SALOME_Exception); diff --git a/idl/HOMARD_Gen.idl b/idl/HOMARD_Gen.idl index 2bf179f0..8981c2a8 100644 --- a/idl/HOMARD_Gen.idl +++ b/idl/HOMARD_Gen.idl @@ -40,92 +40,114 @@ module HOMARD interface HOMARD_Gen : Engines::EngineComponent, SALOMEDS::Driver { - HOMARD_Cas CreateCase(in string nomCas, in string MeshName, in string FileName ) +// +// A. Les methodes qui suivent sont celles que l'on retrouvera dans +// le fichier resources/HOMARDCatalog.xml.in pour definir le composant HOMARD dans YACS +// A priori, ce sont les seules sont l'utilisateur doit connaitre l'existence. +// +// A.1. Les creations +// + HOMARD_Cas CreateCase(in string CaseName, in string MeshName, in string FileName ) raises (SALOME::SALOME_Exception); - HOMARD_Hypothesis CreateHypothesis(in string nomHypothesis ) + HOMARD_Hypothesis CreateHypothesis(in string HypoName ) raises (SALOME::SALOME_Exception); - HOMARD_Iteration CreateIteration(in string nomIter, in string nomIterParent ) + HOMARD_Iteration CreateIteration(in string IterName, in string PreviousIterName ) raises (SALOME::SALOME_Exception); - HOMARD_Zone CreateZoneBox (in string nomZone, + HOMARD_Zone CreateZoneBox (in string ZoneName, in double Xmini, in double Xmaxi, in double Ymini, in double Ymaxi, in double Zmini, in double Zmaxi) raises (SALOME::SALOME_Exception); - HOMARD_Zone CreateZoneSphere (in string nomZone, + HOMARD_Zone CreateZoneSphere (in string ZoneName, in double Xcentre, in double Ycentre, in double Zcentre, - in double Rayon) + in double Radius) raises (SALOME::SALOME_Exception); - HOMARD_Zone CreateZoneCylinder (in string nomZone, + HOMARD_Zone CreateZoneCylinder (in string ZoneName, in double Xcentre, in double Ycentre, in double Zcentre, - in double Xaxe, in double Yaxe, in double Zaxe, - in double Rayon, in double Haut) + in double Xaxis, in double Yaxis, in double Zaxis, + in double Radius, in double Height) raises (SALOME::SALOME_Exception); - HOMARD_Zone CreateZonePipe (in string nomZone, + HOMARD_Zone CreateZonePipe (in string ZoneName, in double Xcentre, in double Ycentre, in double Zcentre, - in double Xaxe, in double Yaxe, in double Zaxe, - in double Rayon, in double Haut, in double Rayonint) + in double Xaxis, in double Yaxis, in double Zaxis, + in double Radius, in double Height, in double InternalRadius) raises (SALOME::SALOME_Exception); - HOMARD_Zone CreateZoneBox2D (in string nomZone, + HOMARD_Zone CreateZoneBox2D (in string ZoneName, in double Umini, in double Umaxi, in double Vmini, in double Vmaxi, in long Orient) raises (SALOME::SALOME_Exception); - HOMARD_Zone CreateZoneDisk (in string nomZone, + HOMARD_Zone CreateZoneDisk (in string ZoneName, in double Ucentre, in double Vcentre, - in double Rayon, in long Orient) + in double Radius, in long Orient) raises (SALOME::SALOME_Exception); - HOMARD_Zone CreateZoneDiskWithHole (in string nomZone, + HOMARD_Zone CreateZoneDiskWithHole (in string ZoneName, in double Ucentre, in double Vcentre, - in double Rayon, in double Rayonint, + in double Radius, in double InternalRadius, in long Orient) raises (SALOME::SALOME_Exception); - HOMARD_Boundary CreateBoundaryDi (in string nomBoundary, in string MeshName, in string FileName); - HOMARD_Boundary CreateBoundaryCylinder (in string nomBoundary, + HOMARD_Boundary CreateBoundaryDi (in string BounName, in string MeshName, in string FileName) + raises (SALOME::SALOME_Exception); + HOMARD_Boundary CreateBoundaryCylinder (in string BounName, in double Xcentre, in double Ycentre, in double Zcentre, in double Xaxis, in double Yaxis, in double Zaxis, - in double Rayon); - HOMARD_Boundary CreateBoundarySphere (in string nomBoundary, + in double Radius) + raises (SALOME::SALOME_Exception); + HOMARD_Boundary CreateBoundarySphere (in string BounName, in double Xcentre, in double Ycentre, in double Zcentre, - in double Rayon); - void AssociateIterIter(in string nomIterParent, in string nomIter) + in double Radius) raises (SALOME::SALOME_Exception); - void AssociateIterHypo(in string nomIter, in string nomHypothesis) +// +// A.2. Les associations +// + void AssociateIterHypo(in string IterName, in string HypoName) raises (SALOME::SALOME_Exception); - void AssociateHypoZone(in string nomZone, in string nomHypothesis) + void AssociateHypoZone(in string ZoneName, in string HypoName) raises (SALOME::SALOME_Exception); - void DissociateHypoZone(in string nomZone, in string nomHypothesis) +// +// A.3. Les informations +// + string GetCaseName(in string IterName) raises (SALOME::SALOME_Exception); + HOMARD_Cas GetCas(in string CaseName) raises (SALOME::SALOME_Exception); + HOMARD_Boundary GetBoundary(in string BounName) raises (SALOME::SALOME_Exception); + HOMARD_Zone GetZone(in string ZoneName) raises (SALOME::SALOME_Exception); + HOMARD_Hypothesis GetHypothesis(in string HypoName) raises (SALOME::SALOME_Exception); + HOMARD_Iteration GetIteration(in string IterName) raises (SALOME::SALOME_Exception); + listeCases GetAllCases() raises (SALOME::SALOME_Exception); + listeBoundarys GetAllBoundarys() raises (SALOME::SALOME_Exception); + listeHypotheses GetAllHypotheses() raises (SALOME::SALOME_Exception); + listeZones GetAllZones() raises (SALOME::SALOME_Exception); + listeIterations GetAllIterations() raises (SALOME::SALOME_Exception); +// +// A.4. L'etude +// + void SetCurrentStudy(in SALOMEDS::Study theStudy) raises (SALOME::SALOME_Exception); +// +// B. Les methodes qui suivent n'apparaissent pas dans le composant HOMARD dans YACS +// L'utilisateur ne devrait pas les connaitre (ni s'en servir, a fortiori) +// + void AssociateIterIter(in string PreviousIterName, in string IterName) + raises (SALOME::SALOME_Exception); + void DissociateHypoZone(in string ZoneName, in string HypoName) raises (SALOME::SALOME_Exception); - void InvalideBoundary (in string nomBoundary) raises (SALOME::SALOME_Exception); - void InvalideZone (in string nomZone) raises (SALOME::SALOME_Exception); - void InvalideHypo (in string nomHypo) raises (SALOME::SALOME_Exception); - void InvalideIter (in string nomIter) raises (SALOME::SALOME_Exception); + void InvalideBoundary (in string BounName) raises (SALOME::SALOME_Exception); + void InvalideZone (in string ZoneName) raises (SALOME::SALOME_Exception); + void InvalideHypo (in string HypoName) raises (SALOME::SALOME_Exception); + void InvalideIter (in string IterName) raises (SALOME::SALOME_Exception); - boolean Compute (in string nomIter, in long etatMenage) + boolean Compute (in string IterName, in long etatMenage) raises (SALOME::SALOME_Exception); - boolean VerifieDir (in string nomIter) raises (SALOME::SALOME_Exception); - - string GetCaseName(in string nomIter) raises (SALOME::SALOME_Exception); + boolean VerifieDir (in string IterName) raises (SALOME::SALOME_Exception); void PublishFileUnderIteration(in string NomIter, in string NomFich, in string Commentaire) raises (SALOME::SALOME_Exception); void PublishResultInSmesh(in string NomFich, in long IconeType) raises (SALOME::SALOME_Exception); - HOMARD_Cas GetCas(in string nomCas) raises (SALOME::SALOME_Exception); - HOMARD_Boundary GetBoundary(in string nomBoundary) raises (SALOME::SALOME_Exception); - HOMARD_Zone GetZone(in string nomZone) raises (SALOME::SALOME_Exception); - HOMARD_Hypothesis GetHypothesis(in string nomHypo) raises (SALOME::SALOME_Exception); - HOMARD_Iteration GetIteration(in string nomIter) raises (SALOME::SALOME_Exception); - listeCases GetAllCases() raises (SALOME::SALOME_Exception); - listeBoundarys GetAllBoundarys() raises (SALOME::SALOME_Exception); - listeHypotheses GetAllHypotheses() raises (SALOME::SALOME_Exception); - listeZones GetAllZones() raises (SALOME::SALOME_Exception); - listeIterations GetAllIterations() raises (SALOME::SALOME_Exception); - - void SetCurrentStudy(in SALOMEDS::Study theStudy) raises (SALOME::SALOME_Exception); SALOMEDS::Study GetCurrentStudy() raises (SALOME::SALOME_Exception); + long GetCurrentStudyID() raises (SALOME::SALOME_Exception); }; }; diff --git a/idl/HOMARD_Hypothesis.idl b/idl/HOMARD_Hypothesis.idl index f5ddc8f0..0d1b697f 100644 --- a/idl/HOMARD_Hypothesis.idl +++ b/idl/HOMARD_Hypothesis.idl @@ -20,7 +20,10 @@ #ifndef _HOMARD_HYPOTHESIS_IDL #define _HOMARD_HYPOTHESIS_IDL +#include "SALOME_Component.idl" #include "SALOME_Exception.idl" +#include "SALOMEDS.idl" + #include "HOMARD_Cas.idl" module HOMARD @@ -30,7 +33,7 @@ module HOMARD typedef sequence listeComposantsHypo ; typedef sequence listeTypes; typedef sequence listFieldInterpHypo; - + struct InfosHypo { string FieldName; @@ -42,7 +45,7 @@ module HOMARD double ThreshC; }; - interface HOMARD_Hypothesis + interface HOMARD_Hypothesis : Engines::EngineComponent { void SetName(in string NomHypothesis) raises (SALOME::SALOME_Exception); diff --git a/idl/HOMARD_Iteration.idl b/idl/HOMARD_Iteration.idl index 61522190..cc4d0856 100644 --- a/idl/HOMARD_Iteration.idl +++ b/idl/HOMARD_Iteration.idl @@ -20,13 +20,15 @@ #ifndef _HOMARD_ITERATION_IDL #define _HOMARD_ITERATION_IDL +#include "SALOME_Component.idl" #include "SALOME_Exception.idl" +#include "SALOMEDS.idl" module HOMARD { typedef sequence listeIterFilles ; - interface HOMARD_Iteration + interface HOMARD_Iteration : Engines::EngineComponent { void SetName(in string NomIter) raises (SALOME::SALOME_Exception); string GetName() raises (SALOME::SALOME_Exception); @@ -68,7 +70,7 @@ module HOMARD void SetMessFile(in string MessFile) raises (SALOME::SALOME_Exception); string GetMessFile() raises (SALOME::SALOME_Exception); - boolean Compute() raises (SALOME::SALOME_Exception); + boolean Compute(in long etatMenage) raises (SALOME::SALOME_Exception); string GetDumpPython() raises (SALOME::SALOME_Exception); }; diff --git a/idl/HOMARD_Zone.idl b/idl/HOMARD_Zone.idl index c7bde424..cdc22467 100644 --- a/idl/HOMARD_Zone.idl +++ b/idl/HOMARD_Zone.idl @@ -20,14 +20,16 @@ #ifndef _HOMARD_Zone_IDL #define _HOMARD_Zone_IDL +#include "SALOME_Component.idl" #include "SALOME_Exception.idl" +#include "SALOMEDS.idl" module HOMARD { typedef sequence double_array ; typedef sequence listeHypo ; - interface HOMARD_Zone + interface HOMARD_Zone : Engines::EngineComponent { void SetName (in string NomZone) raises (SALOME::SALOME_Exception); diff --git a/resources/HOMARDCatalog.xml.in b/resources/HOMARDCatalog.xml.in index 43e11a99..3919a172 100644 --- a/resources/HOMARDCatalog.xml.in +++ b/resources/HOMARDCatalog.xml.in @@ -1,7 +1,7 @@ - + @@ -29,20 +29,882 @@ + + + + + + + + + + + + + + + + - - HOMARD - HOMARD GUI - Data - C. Caremoli - @VERSION@ - EDF - RD - 1 - HOMARD.png - 'linux' ~ OS - - - + HOMARD + HOMARD + OTHER + HOMARD team - EDF RD + 1.0 + unknown + 1 + 1 + HOMARD_2.png + + + HOMARD_Gen + unknown + + + CreateCase + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + CaseName + string + unknown + + + MeshName + string + unknown + + + FileName + string + unknown + + + + + return + HOMARD_Cas + unknown + + + + + + CreateHypothesis + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + HypoName + string + unknown + + + + + return + HOMARD_Hypothesis + unknown + + + + + + CreateIteration + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + IterName + string + unknown + + + PreviousIterName + string + unknown + + + + + return + HOMARD_Iteration + unknown + + + + + + CreateZoneBox + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + ZoneName + string + unknown + + + Xmini + double + unknown + + + Xmaxi + double + unknown + + + Ymini + double + unknown + + + Ymaxi + double + unknown + + + Zmini + double + unknown + + + Zmaxi + double + unknown + + + + + return + HOMARD_Zone + unknown + + + + + + CreateZoneSphere + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + ZoneName + string + unknown + + + Xcentre + double + unknown + + + Ycentre + double + unknown + + + Zcentre + double + unknown + + + Radius + double + unknown + + + + + return + HOMARD_Zone + unknown + + + + + + CreateZoneCylinder + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + ZoneName + string + unknown + + + Xcentre + double + unknown + + + Ycentre + double + unknown + + + Zcentre + double + unknown + + + Xaxis + double + unknown + + + Yaxis + double + unknown + + + Zaxis + double + unknown + + + Radius + double + unknown + + + Height + double + unknown + + + + + return + HOMARD_Zone + unknown + + + + + + CreateZonePipe + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + ZoneName + string + unknown + + + Xcentre + double + unknown + + + Ycentre + double + unknown + + + Zcentre + double + unknown + + + Xaxis + double + unknown + + + Yaxis + double + unknown + + + Zaxis + double + unknown + + + Radius + double + unknown + + + Height + double + unknown + + + InternalRadius + double + unknown + + + + + return + HOMARD_Zone + unknown + + + + + + CreateZoneBox2D + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + ZoneName + string + unknown + + + Umini + double + unknown + + + Umaxi + double + unknown + + + Vmini + double + unknown + + + Vmaxi + double + unknown + + + Orient + long + unknown + + + + + return + HOMARD_Zone + unknown + + + + + + CreateZoneDisk + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + ZoneName + string + unknown + + + Ucentre + double + unknown + + + Vcentre + double + unknown + + + Radius + double + unknown + + + Orient + long + unknown + + + + + return + HOMARD_Zone + unknown + + + + + + CreateZoneDiskWithHole + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + ZoneName + string + unknown + + + Ucentre + double + unknown + + + Vcentre + double + unknown + + + Radius + double + unknown + + + InternalRadius + double + unknown + + + Orient + long + unknown + + + + + return + HOMARD_Zone + unknown + + + + + + CreateBoundaryDi + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + BounName + string + unknown + + + MeshName + string + unknown + + + FileName + string + unknown + + + + + return + HOMARD_Boundary + unknown + + + + + + CreateBoundaryCylinder + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + BounName + string + unknown + + + Xcentre + double + unknown + + + Ycentre + double + unknown + + + Zcentre + double + unknown + + + Xaxis + double + unknown + + + Yaxis + double + unknown + + + Zaxis + double + unknown + + + Radius + double + unknown + + + + + return + HOMARD_Boundary + unknown + + + + + + CreateBoundarySphere + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + BounName + string + unknown + + + Xcentre + double + unknown + + + Ycentre + double + unknown + + + Zcentre + double + unknown + + + Radius + double + unknown + + + + + return + HOMARD_Boundary + unknown + + + + + + AssociateIterHypo + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + IterName + string + unknown + + + HypoName + string + unknown + + + + + + + AssociateHypoZone + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + ZoneName + string + unknown + + + HypoName + string + unknown + + + + + + + GetCaseName + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + IterName + string + unknown + + + + + return + string + unknown + + + + + + GetCas + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + CaseName + string + unknown + + + + + return + HOMARD_Cas + unknown + + + + + + GetBoundary + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + BounName + string + unknown + + + + + return + HOMARD_Boundary + unknown + + + + + + GetZone + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + ZoneName + string + unknown + + + + + return + HOMARD_Zone + unknown + + + + + + GetHypothesis + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + HypoName + string + unknown + + + + + return + HOMARD_Hypothesis + unknown + + + + + + GetIteration + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + IterName + string + unknown + + + + + return + HOMARD_Iteration + unknown + + + + + + GetAllCases + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + + return + HOMARD/listeCases + unknown + + + + + + GetAllBoundarys + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + + return + HOMARD/listeBoundarys + unknown + + + + + + GetAllHypotheses + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + + return + HOMARD/listeHypotheses + unknown + + + + + + GetAllZones + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + + return + HOMARD/listeZones + unknown + + + + + + GetAllIterations + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + + return + HOMARD/listeIterations + unknown + + + + + + SetCurrentStudy + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + theStudy + Study + unknown + + + + + + + + + diff --git a/src/HOMARD/HOMARD_Hypothesis.cxx b/src/HOMARD/HOMARD_Hypothesis.cxx index 15b226ab..ea9a10c6 100644 --- a/src/HOMARD/HOMARD_Hypothesis.cxx +++ b/src/HOMARD/HOMARD_Hypothesis.cxx @@ -200,11 +200,12 @@ int HOMARD_Hypothesis::GetUnRefType() const void HOMARD_Hypothesis::SetField( const char* FieldName ) { _Field = std::string( FieldName ); - MESSAGE( "dans SetField, FieldName : " << FieldName ); + MESSAGE( "SetField : FieldName = " << FieldName ); } //============================================================================= void HOMARD_Hypothesis::SetRefinThr( int TypeThR, double ThreshR ) { + MESSAGE( "SetRefinThr : TypeThR = " << TypeThR << ", ThreshR = " << ThreshR ); ASSERT(!(( TypeThR < 0) or (TypeThR > 3 ))); _TypeThR = TypeThR; _ThreshR = ThreshR; diff --git a/src/HOMARD/HOMARD_Iteration.cxx b/src/HOMARD/HOMARD_Iteration.cxx index 99b86c9e..f5dd9179 100644 --- a/src/HOMARD/HOMARD_Iteration.cxx +++ b/src/HOMARD/HOMARD_Iteration.cxx @@ -52,18 +52,6 @@ HOMARD_Iteration::~HOMARD_Iteration() MESSAGE("~HOMARD_Iteration"); } -//============================================================================= -/*! - * - */ -//============================================================================= -bool HOMARD_Iteration::Compute() -{ - MESSAGE("Compute --> ne fait rien"); - _Etat=true; - return true; -} - //============================================================================= /*! */ diff --git a/src/HOMARD/HOMARD_Iteration.hxx b/src/HOMARD/HOMARD_Iteration.hxx index 3f873c8f..7345a83b 100644 --- a/src/HOMARD/HOMARD_Iteration.hxx +++ b/src/HOMARD/HOMARD_Iteration.hxx @@ -34,8 +34,6 @@ public: HOMARD_Iteration(); ~HOMARD_Iteration(); - bool Compute(); - void SetName( const char* NomIter ); std::string GetName() const; std::string GetDumpPython() const; diff --git a/src/HOMARD_I/HOMARD_Boundary_i.hxx b/src/HOMARD_I/HOMARD_Boundary_i.hxx index ac436486..a71a04fd 100644 --- a/src/HOMARD_I/HOMARD_Boundary_i.hxx +++ b/src/HOMARD_I/HOMARD_Boundary_i.hxx @@ -24,12 +24,18 @@ #include CORBA_SERVER_HEADER(HOMARD_Gen) #include CORBA_SERVER_HEADER(HOMARD_Boundary) +#include "SALOME_Component_i.hxx" +#include "SALOME_NamingService.hxx" +#include "Utils_CorbaException.hxx" + #include class HOMARD_Boundary; -class HOMARD_Boundary_i: public virtual POA_HOMARD::HOMARD_Boundary, - public virtual PortableServer::ServantBase +class HOMARD_Boundary_i: + public virtual Engines_Component_i, + public virtual POA_HOMARD::HOMARD_Boundary, + public virtual PortableServer::ServantBase { public: HOMARD_Boundary_i( CORBA::ORB_ptr orb, HOMARD::HOMARD_Gen_var gen_i ); diff --git a/src/HOMARD_I/HOMARD_Cas_i.hxx b/src/HOMARD_I/HOMARD_Cas_i.hxx index 110690ef..93a59b2f 100644 --- a/src/HOMARD_I/HOMARD_Cas_i.hxx +++ b/src/HOMARD_I/HOMARD_Cas_i.hxx @@ -24,12 +24,18 @@ #include CORBA_SERVER_HEADER(HOMARD_Gen) #include CORBA_SERVER_HEADER(HOMARD_Cas) +#include "SALOME_Component_i.hxx" +#include "SALOME_NamingService.hxx" +#include "Utils_CorbaException.hxx" + #include class HOMARD_Cas; -class HOMARD_Cas_i: public virtual POA_HOMARD::HOMARD_Cas, - public virtual PortableServer::ServantBase +class HOMARD_Cas_i: + public virtual Engines_Component_i, + public virtual POA_HOMARD::HOMARD_Cas, + public virtual PortableServer::ServantBase { public: HOMARD_Cas_i( CORBA::ORB_ptr orb, HOMARD::HOMARD_Gen_var gen_i ); diff --git a/src/HOMARD_I/HOMARD_Gen_i.cxx b/src/HOMARD_I/HOMARD_Gen_i.cxx index fffdffaa..469c9b44 100755 --- a/src/HOMARD_I/HOMARD_Gen_i.cxx +++ b/src/HOMARD_I/HOMARD_Gen_i.cxx @@ -73,14 +73,14 @@ std::string RemoveTabulation( std::string theScript ) * standard constructor */ //============================================================================= -HOMARD_Gen_i::HOMARD_Gen_i(CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - PortableServer::ObjectId * contId, - const char *instanceName, - const char *interfaceName) : - Engines_Component_i(orb, poa, contId, instanceName, interfaceName) -{ - MESSAGE("activate object"); +HOMARD_Gen_i::HOMARD_Gen_i( CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + PortableServer::ObjectId * contId, + const char *instanceName, + const char *interfaceName) : +Engines_Component_i(orb, poa, contId, instanceName, interfaceName) +{ + MESSAGE("constructor"); _thisObj = this; _id = _poa->activate_object(_thisObj); @@ -172,7 +172,7 @@ int HOMARD_Gen_i::GetCurrentStudyID() //============================================================================= void HOMARD_Gen_i::AssociateCaseIter(const char* nomCas, const char* nomIter, const char* labelIter) { - MESSAGE( "AssociateCaseIter " << nomCas << " ," << nomIter << "," << labelIter ); + MESSAGE( "AssociateCaseIter : " << nomCas << " ," << nomIter << "," << labelIter ); IsValidStudy () ; HOMARD::HOMARD_Cas_var myCase = myContextMap[GetCurrentStudyID()]._mesCas[nomCas]; @@ -220,7 +220,7 @@ void HOMARD_Gen_i::AssociateCaseIter(const char* nomCas, const char* nomIter, co void HOMARD_Gen_i::SetEtatIter(const char* nomIter, const bool EtatCalcul) //===================================================================================== { - MESSAGE( "SetEtatIter, nomIter = " << nomIter << " etat " << EtatCalcul ); + MESSAGE( "SetEtatIter : nomIter = " << nomIter << " etat " << EtatCalcul ); HOMARD::HOMARD_Iteration_var myIteration = myContextMap[GetCurrentStudyID()]._mesIterations[nomIter]; if (CORBA::is_nil(myIteration)) { @@ -261,7 +261,7 @@ void HOMARD_Gen_i::SetEtatIter(const char* nomIter, const bool EtatCalcul) void HOMARD_Gen_i::InvalideBoundary(const char* BoundaryName) //===================================================================================== { - MESSAGE( "InvalideBoundary, BoundaryName = " << BoundaryName ); + MESSAGE( "InvalideBoundary : BoundaryName = " << BoundaryName ); HOMARD::HOMARD_Boundary_var myBoundary = myContextMap[GetCurrentStudyID()]._mesBoundarys[BoundaryName]; if (CORBA::is_nil(myBoundary)) { @@ -288,7 +288,7 @@ void HOMARD_Gen_i::InvalideBoundary(const char* BoundaryName) void HOMARD_Gen_i::InvalideZone(const char* ZoneName) //===================================================================================== { - MESSAGE( "InvalideZone, ZoneName = " << ZoneName ); + MESSAGE( "InvalideZone : ZoneName = " << ZoneName ); HOMARD::HOMARD_Zone_var myZone = myContextMap[GetCurrentStudyID()]._mesZones[ZoneName]; if (CORBA::is_nil(myZone)) { @@ -310,7 +310,7 @@ void HOMARD_Gen_i::InvalideZone(const char* ZoneName) void HOMARD_Gen_i::InvalideHypo(const char* nomHypo) //===================================================================================== { - MESSAGE( "InvalideHypo, nomHypo = " << nomHypo ); + MESSAGE( "InvalideHypo : nomHypo = " << nomHypo ); HOMARD::HOMARD_Hypothesis_var myHypo = myContextMap[GetCurrentStudyID()]._mesHypotheses[nomHypo]; if (CORBA::is_nil(myHypo)) { @@ -334,7 +334,7 @@ void HOMARD_Gen_i::InvalideHypo(const char* nomHypo) void HOMARD_Gen_i::InvalideIter(const char* nomIter) //===================================================================================== { - MESSAGE("InvalideIter, nomIter = " << nomIter); + MESSAGE("InvalideIter : nomIter = " << nomIter); SetEtatIter(nomIter,false); HOMARD::HOMARD_Iteration_var myIteration = myContextMap[GetCurrentStudyID()]._mesIterations[nomIter]; if (CORBA::is_nil(myIteration)) @@ -398,7 +398,7 @@ void HOMARD_Gen_i::InvalideIter(const char* nomIter) //===================================================================================== void HOMARD_Gen_i::AssociateHypoZone(const char* ZoneName, const char* nomHypothesis) { - MESSAGE ( " AssociateHypoZone, ZoneName= " << ZoneName << ", nomHypo = " << nomHypothesis); + MESSAGE ( "AssociateHypoZone : ZoneName= " << ZoneName << ", nomHypo = " << nomHypothesis); IsValidStudy () ; HOMARD::HOMARD_Hypothesis_var myHypo = myContextMap[GetCurrentStudyID()]._mesHypotheses[nomHypothesis]; @@ -425,7 +425,7 @@ void HOMARD_Gen_i::AssociateHypoZone(const char* ZoneName, const char* nomHypoth //===================================================================================== void HOMARD_Gen_i::DissociateHypoZone(const char* ZoneName, const char* nomHypothesis) { - MESSAGE ( " DissociateHypoZone, ZoneName= " << ZoneName << ", nomHypo = " << nomHypothesis); + MESSAGE ( "DissociateHypoZone : ZoneName= " << ZoneName << ", nomHypo = " << nomHypothesis); IsValidStudy () ; HOMARD::HOMARD_Hypothesis_var myHypo = myContextMap[GetCurrentStudyID()]._mesHypotheses[nomHypothesis]; @@ -465,7 +465,7 @@ void HOMARD_Gen_i::DissociateHypoZone(const char* ZoneName, const char* nomHypot //============================================================================= void HOMARD_Gen_i::AssociateIterIter(const char* nomIterParent, const char* nomIter) { - MESSAGE ( "AssociateIterIter, nomIter = " << nomIter << " nomIterParent = " << nomIterParent); + MESSAGE ( "AssociateIterIter : nomIter = " << nomIter << " nomIterParent = " << nomIterParent); IsValidStudy () ; HOMARD::HOMARD_Iteration_var myIterationParent = myContextMap[GetCurrentStudyID()]._mesIterations[nomIterParent]; @@ -480,7 +480,7 @@ void HOMARD_Gen_i::AssociateIterIter(const char* nomIterParent, const char* nomI //=================================================================================== void HOMARD_Gen_i::AssociateIterHypo(const char* nomIter, const char* nomHypo) { - MESSAGE("AssociateIterHypo, nomHypo = " << nomHypo << " nomIter = " << nomIter); + MESSAGE("AssociateIterHypo : nomHypo = " << nomHypo << " nomIter = " << nomIter); IsValidStudy () ; HOMARD::HOMARD_Hypothesis_var myHypo = myContextMap[GetCurrentStudyID()]._mesHypotheses[nomHypo]; @@ -521,7 +521,7 @@ CORBA::Boolean HOMARD_Gen_i::VerifieDir(const char* nomDir) //============================================================================= HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCase(const char* nomCas, const char* MeshName, const char* MeshFile) { - MESSAGE ( "CreateCase, nomCas = " << nomCas << "MeshName = " << MeshName ); + MESSAGE ( "CreateCase : nomCas = " << nomCas << ", MeshName = " << MeshName << ", MeshFile = " << MeshFile ); IsValidStudy () ; if ((myContextMap[GetCurrentStudyID()]._mesCas).find(nomCas)!=(myContextMap[GetCurrentStudyID()]._mesCas).end()) @@ -620,7 +620,9 @@ HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::GetZone(const char* ZoneName) //============================================================================= HOMARD::HOMARD_Hypothesis_ptr HOMARD_Gen_i::GetHypothesis(const char* nomHypothesis) { + MESSAGE ( "GetHypothesis : nomHypothesis = " << nomHypothesis ); IsValidStudy () ; + MESSAGE ( "GetHypothesis : GetCurrentStudyID() = " << GetCurrentStudyID() ); HOMARD::HOMARD_Hypothesis_var myHypothesis = myContextMap[GetCurrentStudyID()]._mesHypotheses[nomHypothesis]; ASSERT(!CORBA::is_nil(myHypothesis)); return HOMARD::HOMARD_Hypothesis::_duplicate(myHypothesis); @@ -647,7 +649,7 @@ HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::GetBoundary(const char* nomBoundary) //============================================================================= HOMARD::HOMARD_Hypothesis_ptr HOMARD_Gen_i::CreateHypothesis(const char* nomHypothesis) { - MESSAGE ( "CreateHypothesis, nomHypothesis = " << nomHypothesis ); + MESSAGE ( "CreateHypothesis : nomHypothesis = " << nomHypothesis ); IsValidStudy () ; if ((myContextMap[GetCurrentStudyID()]._mesHypotheses).find(nomHypothesis) != (myContextMap[GetCurrentStudyID()]._mesHypotheses).end()) @@ -672,7 +674,7 @@ HOMARD::HOMARD_Hypothesis_ptr HOMARD_Gen_i::CreateHypothesis(const char* nomHypo HOMARD::HOMARD_Iteration_ptr HOMARD_Gen_i::CreateIteration(const char* nomIteration, const char* nomIterParent) //============================================================================================================ { - MESSAGE ("CreateIteration, nomIteration = " << nomIteration << "nomIterParent = " << nomIterParent); + MESSAGE ("CreateIteration : nomIteration = " << nomIteration << "nomIterParent = " << nomIterParent); IsValidStudy () ; HOMARD::HOMARD_Iteration_var myIterationParent = myContextMap[GetCurrentStudyID()]._mesIterations[nomIterParent]; @@ -686,7 +688,7 @@ HOMARD::HOMARD_Iteration_ptr HOMARD_Gen_i::CreateIteration(const char* nomIterat }; const char* nomCas = GetCaseName(nomIterParent); - MESSAGE ("CreateIteration, nomCas = " << nomCas); + MESSAGE ("CreateIteration : nomCas = " << nomCas); HOMARD::HOMARD_Cas_var myCase = myContextMap[GetCurrentStudyID()]._mesCas[nomCas]; if (CORBA::is_nil(myCase)) { @@ -754,7 +756,7 @@ HOMARD::HOMARD_Iteration_ptr HOMARD_Gen_i::CreateIteration(const char* nomIterat //============================================================================= HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::CreateBoundary(const char* BoundaryName, CORBA::Long BoundaryType) { - MESSAGE ("CreateBoundary, BoundaryName = " << BoundaryName << ", BoundaryType = " << BoundaryType); + MESSAGE ("CreateBoundary : BoundaryName = " << BoundaryName << ", BoundaryType = " << BoundaryType); IsValidStudy () ; if ((myContextMap[GetCurrentStudyID()]._mesBoundarys).find(BoundaryName)!=(myContextMap[GetCurrentStudyID()]._mesBoundarys).end()) @@ -780,7 +782,7 @@ HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::CreateBoundary(const char* BoundaryNam //============================================================================= HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::CreateBoundaryDi(const char* BoundaryName, const char* MeshName, const char* MeshFile) { - MESSAGE ("CreateBoundaryDi, BoundaryName = " << BoundaryName << "MeshName = " << MeshName ); + MESSAGE ("CreateBoundaryDi : BoundaryName = " << BoundaryName << "MeshName = " << MeshName ); HOMARD::HOMARD_Boundary_var myBoundary = CreateBoundary(BoundaryName, 0); myBoundary->SetMeshFile( MeshFile ) ; myBoundary->SetMeshName( MeshName ) ; @@ -793,7 +795,7 @@ HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::CreateBoundaryCylinder(const char* Bou double Xaxis, double Yaxis, double Zaxis, double Rayon) { - MESSAGE ("CreateBoundaryCylinder, BoundaryName = " << BoundaryName ) ; + MESSAGE ("CreateBoundaryCylinder : BoundaryName = " << BoundaryName ) ; HOMARD::HOMARD_Boundary_var myBoundary = CreateBoundary(BoundaryName, 1) ; myBoundary->SetCylinder( Xcentre, Ycentre, Zcentre, Xaxis, Yaxis, Zaxis, Rayon ) ; @@ -804,7 +806,7 @@ HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::CreateBoundarySphere(const char* Bound double Xcentre, double Ycentre, double Zcentre, double Rayon) { - MESSAGE ("CreateBoundarySphere, BoundaryName = " << BoundaryName ) ; + MESSAGE ("CreateBoundarySphere : BoundaryName = " << BoundaryName ) ; HOMARD::HOMARD_Boundary_var myBoundary = CreateBoundary(BoundaryName, 2) ; myBoundary->SetSphere( Xcentre, Ycentre, Zcentre, Rayon ) ; @@ -815,7 +817,7 @@ HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::CreateBoundarySphere(const char* Bound //============================================================================= HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZone(const char* ZoneName, CORBA::Long ZoneType) { - MESSAGE ("CreateZone, ZoneName = " << ZoneName << ", ZoneType = " << ZoneType); + MESSAGE ("CreateZone : ZoneName = " << ZoneName << ", ZoneType = " << ZoneType); IsValidStudy () ; if ((myContextMap[GetCurrentStudyID()]._mesZones).find(ZoneName)!=(myContextMap[GetCurrentStudyID()]._mesZones).end()) @@ -844,7 +846,7 @@ HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZoneBox(const char* ZoneName, double Ymini, double Ymaxi, double Zmini, double Zmaxi) { - MESSAGE ("CreateZoneBox, ZoneName = " << ZoneName ) ; + MESSAGE ("CreateZoneBox : ZoneName = " << ZoneName ) ; HOMARD::HOMARD_Zone_var myZone = CreateZone(ZoneName, 2) ; myZone->SetBox ( Xmini, Xmaxi, Ymini, Ymaxi, Zmini, Zmaxi) ; @@ -854,7 +856,7 @@ HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZoneBox(const char* ZoneName, HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZoneSphere(const char* ZoneName, double Xcentre, double Ycentre, double Zcentre, double Rayon) { - MESSAGE ("CreateZoneSphere, ZoneName = " << ZoneName ) ; + MESSAGE ("CreateZoneSphere : ZoneName = " << ZoneName ) ; HOMARD::HOMARD_Zone_var myZone = CreateZone(ZoneName, 4) ; myZone->SetSphere( Xcentre, Ycentre, Zcentre, Rayon ) ; @@ -866,7 +868,7 @@ HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZoneCylinder(const char* ZoneName, double Xaxe, double Yaxe, double Zaxe, double Rayon, double Haut) { - MESSAGE ("CreateZoneCylinder, ZoneName = " << ZoneName ) ; + MESSAGE ("CreateZoneCylinder : ZoneName = " << ZoneName ) ; HOMARD::HOMARD_Zone_var myZone = CreateZone(ZoneName, 5) ; myZone->SetCylinder( Xcentre, Ycentre, Zcentre, Xaxe, Yaxe, Zaxe, Rayon, Haut ) ; @@ -878,7 +880,7 @@ HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZonePipe(const char* ZoneName, double Xaxe, double Yaxe, double Zaxe, double Rayon, double Haut, double Rayonint) { - MESSAGE ("CreateZonePipe, ZoneName = " << ZoneName ) ; + MESSAGE ("CreateZonePipe : ZoneName = " << ZoneName ) ; HOMARD::HOMARD_Zone_var myZone = CreateZone(ZoneName, 7) ; myZone->SetPipe( Xcentre, Ycentre, Zcentre, Xaxe, Yaxe, Zaxe, Rayon, Haut, Rayonint ) ; @@ -890,7 +892,7 @@ HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZoneBox2D(const char* ZoneName, double Vmini, double Vmaxi, CORBA::Long Orient) { - MESSAGE ("CreateZoneBox2D, ZoneName = " << ZoneName ) ; + MESSAGE ("CreateZoneBox2D : ZoneName = " << ZoneName ) ; // MESSAGE ("Umini = " << Umini << ", Umaxi =" << Umaxi ) ; // MESSAGE ("Vmini = " << Vmini << ", Vmaxi =" << Vmaxi ) ; // MESSAGE ("Orient = " << Orient ) ; @@ -932,7 +934,7 @@ HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZoneDisk(const char* ZoneName, double Rayon, CORBA::Long Orient) { - MESSAGE ("CreateZoneDisk, ZoneName = " << ZoneName ) ; + MESSAGE ("CreateZoneDisk : ZoneName = " << ZoneName ) ; double Xcentre ; double Ycentre ; double Zcentre ; @@ -961,7 +963,7 @@ HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZoneDiskWithHole(const char* ZoneNam double Rayon, double Rayonint, CORBA::Long Orient) { - MESSAGE ("CreateZoneDiskWithHole, ZoneName = " << ZoneName ) ; + MESSAGE ("CreateZoneDiskWithHole : ZoneName = " << ZoneName ) ; double Xcentre ; double Ycentre ; double Zcentre ; @@ -991,7 +993,7 @@ HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZoneDiskWithHole(const char* ZoneNam //============================================================================= CORBA::Boolean HOMARD_Gen_i::Compute(const char* nomIteration, CORBA::Long etatMenage) { - MESSAGE ( "Compute, calcul de " << nomIteration ); + MESSAGE ( "Compute : calcul de " << nomIteration ); IsValidStudy () ; HOMARD::HOMARD_Iteration_var myIteration = myContextMap[GetCurrentStudyID()]._mesIterations[nomIteration]; @@ -1014,7 +1016,7 @@ CORBA::Boolean HOMARD_Gen_i::Compute(const char* nomIteration, CORBA::Long etatM { SALOME::ExceptionStruct es; es.type = SALOME::BAD_PARAM; - es.text= "This iteration has no associated hypothese"; + es.text= "This iteration does not have any associated hypothesis."; throw SALOME::SALOME_Exception(es); return 0; } @@ -1022,7 +1024,6 @@ CORBA::Boolean HOMARD_Gen_i::Compute(const char* nomIteration, CORBA::Long etatM ASSERT(!CORBA::is_nil(myHypo)); - // A.4. L'iteration parent const char* nomIterationParent = myIteration->GetIterParent(); HOMARD::HOMARD_Iteration_var myIterationParent = myContextMap[GetCurrentStudyID()]._mesIterations[nomIterationParent]; diff --git a/src/HOMARD_I/HOMARD_Gen_i.hxx b/src/HOMARD_I/HOMARD_Gen_i.hxx index 84647cdc..9761ec98 100644 --- a/src/HOMARD_I/HOMARD_Gen_i.hxx +++ b/src/HOMARD_I/HOMARD_Gen_i.hxx @@ -44,11 +44,11 @@ class HOMARD_Gen_i: public virtual 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); + HOMARD_Gen_i( CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + PortableServer::ObjectId* contId, + const char* instanceName, + const char* interfaceName ); virtual ~HOMARD_Gen_i(); diff --git a/src/HOMARD_I/HOMARD_Hypothesis_i.hxx b/src/HOMARD_I/HOMARD_Hypothesis_i.hxx index 91795574..57a6ecac 100644 --- a/src/HOMARD_I/HOMARD_Hypothesis_i.hxx +++ b/src/HOMARD_I/HOMARD_Hypothesis_i.hxx @@ -24,12 +24,18 @@ #include CORBA_SERVER_HEADER(HOMARD_Gen) #include CORBA_SERVER_HEADER(HOMARD_Hypothesis) +#include "SALOME_Component_i.hxx" +#include "SALOME_NamingService.hxx" +#include "Utils_CorbaException.hxx" + #include class HOMARD_Hypothesis; -class HOMARD_Hypothesis_i: public virtual POA_HOMARD::HOMARD_Hypothesis, - public virtual PortableServer::ServantBase +class HOMARD_Hypothesis_i: + public virtual Engines_Component_i, + public virtual POA_HOMARD::HOMARD_Hypothesis, + public virtual PortableServer::ServantBase { public: HOMARD_Hypothesis_i( CORBA::ORB_ptr orb, HOMARD::HOMARD_Gen_var gen_i ); diff --git a/src/HOMARD_I/HOMARD_Iteration_i.cxx b/src/HOMARD_I/HOMARD_Iteration_i.cxx index 2835129e..77e983a3 100644 --- a/src/HOMARD_I/HOMARD_Iteration_i.cxx +++ b/src/HOMARD_I/HOMARD_Iteration_i.cxx @@ -22,6 +22,8 @@ #include "HOMARD_Iteration.hxx" #include "HOMARD_DriverTools.hxx" +#include "SALOMEDS_Tool.hxx" + #include "utilities.h" //============================================================================= @@ -41,9 +43,9 @@ HOMARD_Iteration_i::HOMARD_Iteration_i() */ //============================================================================= HOMARD_Iteration_i::HOMARD_Iteration_i( CORBA::ORB_ptr orb, - HOMARD::HOMARD_Gen_var engine ) + HOMARD::HOMARD_Gen_var engine ) { - MESSAGE( "HOMARD_Iteration_i" ); + MESSAGE("constructor"); _gen_i = engine; _orb = orb; myHomardIteration = new ::HOMARD_Iteration(); @@ -83,8 +85,6 @@ char* HOMARD_Iteration_i::GetDumpPython() return CORBA::string_dup( myHomardIteration->GetDumpPython().c_str() ); } -//============================================================================= - //============================================================================= void HOMARD_Iteration_i::SetEtat( CORBA::Boolean Etat ) { @@ -166,10 +166,17 @@ void HOMARD_Iteration_i::AddIteration( const char* NomIter ) } //============================================================================= -CORBA::Boolean HOMARD_Iteration_i::Compute() +CORBA::Boolean HOMARD_Iteration_i::Compute(CORBA::Long etatMenage) { + MESSAGE ( "Compute : calcul d'une iteration" ); ASSERT( myHomardIteration ); - return CORBA::Boolean( myHomardIteration->Compute() ); +// +// Nom de l'iteration + char* IterName = GetName() ; + MESSAGE ( ". IterName = " << IterName ); +// B. Calcul : on passe par la methode sur l'objet HOMARD +// Il serait plus elegant de tout faire ici, mais il est complexe de paser tout le contexte + return _gen_i->Compute(IterName, etatMenage) ; } //============================================================================= diff --git a/src/HOMARD_I/HOMARD_Iteration_i.hxx b/src/HOMARD_I/HOMARD_Iteration_i.hxx index 39188159..8a899254 100644 --- a/src/HOMARD_I/HOMARD_Iteration_i.hxx +++ b/src/HOMARD_I/HOMARD_Iteration_i.hxx @@ -24,17 +24,24 @@ #include CORBA_SERVER_HEADER(HOMARD_Gen) #include CORBA_SERVER_HEADER(HOMARD_Iteration) +#include "SALOME_Component_i.hxx" +#include "SALOME_NamingService.hxx" +#include "Utils_CorbaException.hxx" + #include class HOMARD_Iteration; -class HOMARD_Iteration_i: public virtual POA_HOMARD::HOMARD_Iteration, - public virtual PortableServer::ServantBase -{ +class HOMARD_Iteration_i: + public virtual Engines_Component_i, + public virtual POA_HOMARD::HOMARD_Iteration, + public virtual PortableServer::ServantBase +{ public: - HOMARD_Iteration_i( CORBA::ORB_ptr orb, HOMARD::HOMARD_Gen_var gen_i ); + HOMARD_Iteration_i( CORBA::ORB_ptr orb, + HOMARD::HOMARD_Gen_var gen_i ); HOMARD_Iteration_i(); - + virtual ~HOMARD_Iteration_i(); void SetName( const char* NomIteration ); @@ -77,7 +84,7 @@ public: void SetHypoName( const char* NomHypo ); char* GetHypoName(); - CORBA::Boolean Compute(); + CORBA::Boolean Compute(CORBA::Long etatMenage); std::string Dump() const; bool Restore( const std::string& stream ); diff --git a/src/HOMARD_I/HOMARD_Zone_i.hxx b/src/HOMARD_I/HOMARD_Zone_i.hxx index 2434c633..ffefd418 100644 --- a/src/HOMARD_I/HOMARD_Zone_i.hxx +++ b/src/HOMARD_I/HOMARD_Zone_i.hxx @@ -24,12 +24,18 @@ #include CORBA_SERVER_HEADER(HOMARD_Gen) #include CORBA_SERVER_HEADER(HOMARD_Zone) +#include "SALOME_Component_i.hxx" +#include "SALOME_NamingService.hxx" +#include "Utils_CorbaException.hxx" + #include class HOMARD_Zone; -class HOMARD_Zone_i: public virtual POA_HOMARD::HOMARD_Zone, - public virtual PortableServer::ServantBase +class HOMARD_Zone_i: + public virtual Engines_Component_i, + public virtual POA_HOMARD::HOMARD_Zone, + public virtual PortableServer::ServantBase { public: HOMARD_Zone_i( CORBA::ORB_ptr orb, HOMARD::HOMARD_Gen_var gen_i ); diff --git a/tests/Makefile.am b/tests/Makefile.am index 87eb4d99..2204a7b4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -22,17 +22,20 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am dist_salomeres_DATA = \ test_1.pdf \ + test_1.en.pdf \ test_1.py \ test_1.00.med \ test_1.01.med \ test_1.02.med \ test_1.apad.03.bilan \ test_2.pdf \ + test_2.en.pdf \ test_2.py \ test_2.00.med \ test_2.fr.med \ test_2.apad.03.bilan \ test_3.pdf \ + test_3.en.pdf \ test_3.py \ test_3.00.med \ test_3.fr.med \ @@ -40,8 +43,11 @@ dist_salomeres_DATA = \ EXTRA_DIST += \ test_1.odt \ + test_1.en.odt \ test_1.png \ test_2.odt \ + test_2.en.odt \ test_2.png \ test_3.odt \ + test_3.en.odt \ test_3.png diff --git a/tests/test_1.en.odt b/tests/test_1.en.odt new file mode 100644 index 00000000..a728ba78 Binary files /dev/null and b/tests/test_1.en.odt differ diff --git a/tests/test_1.en.pdf b/tests/test_1.en.pdf new file mode 100644 index 00000000..a0642bc0 Binary files /dev/null and b/tests/test_1.en.pdf differ diff --git a/tests/test_1.odt b/tests/test_1.odt index 68551007..257405ff 100644 Binary files a/tests/test_1.odt and b/tests/test_1.odt differ diff --git a/tests/test_1.pdf b/tests/test_1.pdf index eea1b0cc..d663a40a 100644 Binary files a/tests/test_1.pdf and b/tests/test_1.pdf differ diff --git a/tests/test_1.py b/tests/test_1.py index ada59669..95297316 100644 --- a/tests/test_1.py +++ b/tests/test_1.py @@ -22,7 +22,7 @@ Python script for HOMARD Copyright EDF-R&D 2010 Test test_1 """ -__revision__ = "V1.3" +__revision__ = "V1.4" ###################################################################################### Test_Name = "test_1" @@ -94,7 +94,7 @@ Copyright EDF-R&D 2010 I1.SetFieldFile(os.path.join(Rep_Test, Test_Name + '.00.med')) I1.SetTimeStepRank(1, 1) homard.AssociateIterHypo('I1', 'a10_1pc_de_mailles_a_raffiner_sur_ERRE_ELEM_SIGM') - result1 = homard.Compute('I1', 1) + result1 = I1.Compute(1) # Creation of the iteration I2 I2 = homard.CreateIteration('I2', 'I1') @@ -103,14 +103,14 @@ Copyright EDF-R&D 2010 I2.SetFieldFile(os.path.join(Rep_Test, Test_Name + '.01.med')) I2.SetTimeStepRank(1, 1) homard.AssociateIterHypo('I2', 'a10_1pc_de_mailles_a_raffiner_sur_ERRE_ELEM_SIGM') - result2 = homard.Compute('I2', 1) + result2 = I2.Compute(1) # Creation of the iteration I3 I3 = homard.CreateIteration('I3', 'I2') I3.SetMeshName('M3') I3.SetMeshFile(os.path.join(Rep_Test_Resu, 'maill.03.med')) homard.AssociateIterHypo('I3', 'Zones_1_et_2') - result3 = homard.Compute('I3', 1) + result3 = I3.Compute(1) return result1*result2*result3 ###################################################################################### diff --git a/tests/test_2.en.odt b/tests/test_2.en.odt new file mode 100644 index 00000000..44de3cf7 Binary files /dev/null and b/tests/test_2.en.odt differ diff --git a/tests/test_2.en.pdf b/tests/test_2.en.pdf new file mode 100644 index 00000000..75a9e87a Binary files /dev/null and b/tests/test_2.en.pdf differ diff --git a/tests/test_2.odt b/tests/test_2.odt index bd0dd52b..03c61778 100644 Binary files a/tests/test_2.odt and b/tests/test_2.odt differ diff --git a/tests/test_2.pdf b/tests/test_2.pdf index de07fe71..0a058f33 100644 Binary files a/tests/test_2.pdf and b/tests/test_2.pdf differ diff --git a/tests/test_2.py b/tests/test_2.py index 2c8ee955..af64462e 100644 --- a/tests/test_2.py +++ b/tests/test_2.py @@ -22,7 +22,7 @@ Python script for HOMARD Copyright EDF-R&D 2010 Test test_2 """ -__revision__ = "V1.3" +__revision__ = "V1.4" ###################################################################################### Test_Name = "test_2" @@ -85,21 +85,21 @@ Copyright EDF-R&D 2010 Iter_1.SetMeshName('PLAQUE_1') Iter_1.SetMeshFile(os.path.join(Rep_Test_Resu, 'maill.01.med')) homard.AssociateIterHypo('Iter_1', 'Hypo_1') - result1 = homard.Compute('Iter_1', 1) + result1 = Iter_1.Compute(1) # Creation of the iteration Iter_2 Iter_2 = homard.CreateIteration('Iter_2', 'Iter_1') Iter_2.SetMeshName('PLAQUE_2') Iter_2.SetMeshFile(os.path.join(Rep_Test_Resu, 'maill.02.med')) homard.AssociateIterHypo('Iter_2', 'Hypo_1') - result2 = homard.Compute('Iter_2', 1) + result2 = Iter_2.Compute(1) # Creation of the iteration Iter_3 Iter_3 = homard.CreateIteration('Iter_3', 'Iter_2') Iter_3.SetMeshName('PLAQUE_3') Iter_3.SetMeshFile(os.path.join(Rep_Test_Resu, 'maill.03.med')) homard.AssociateIterHypo('Iter_3', 'Hypo_2') - result3 = homard.Compute('Iter_3', 1) + result3 = Iter_3.Compute(1) return result1*result2*result3 ###################################################################################### diff --git a/tests/test_3.en.odt b/tests/test_3.en.odt new file mode 100644 index 00000000..83d4bd2c Binary files /dev/null and b/tests/test_3.en.odt differ diff --git a/tests/test_3.en.pdf b/tests/test_3.en.pdf new file mode 100644 index 00000000..7b1f6e32 Binary files /dev/null and b/tests/test_3.en.pdf differ diff --git a/tests/test_3.odt b/tests/test_3.odt index 002d85a1..a3f0c93e 100644 Binary files a/tests/test_3.odt and b/tests/test_3.odt differ diff --git a/tests/test_3.pdf b/tests/test_3.pdf index 26dc2cac..c05d06ff 100644 Binary files a/tests/test_3.pdf and b/tests/test_3.pdf differ diff --git a/tests/test_3.py b/tests/test_3.py index 8b8df6f4..b75aa970 100644 --- a/tests/test_3.py +++ b/tests/test_3.py @@ -22,7 +22,7 @@ Python script for HOMARD Copyright EDF-R&D 2011 Test test_3 """ -__revision__ = "V1.1" +__revision__ = "V1.2" ###################################################################################### Test_Name = "test_3" @@ -94,14 +94,14 @@ Copyright EDF-R&D 2010 Iter_1.SetMeshName('MOYEU_1') Iter_1.SetMeshFile(os.path.join(Rep_Test_Resu, 'maill.01.med')) homard.AssociateIterHypo('Iter_1', 'Hypo') - result1 = homard.Compute('Iter_1', 1) + result1 = Iter_1.Compute(1) # Creation of the iteration Iter_2 Iter_2 = homard.CreateIteration('Iter_2', 'Iter_1') Iter_2.SetMeshName('MOYEU_2') Iter_2.SetMeshFile(os.path.join(Rep_Test_Resu, 'maill.02.med')) homard.AssociateIterHypo('Iter_2', 'Hypo') - result2 = homard.Compute('Iter_2', 1) + result2 = Iter_2.Compute(1) return result1*result2