From 66b11eed29a6ffa8bce200f6acf05570809b41a6 Mon Sep 17 00:00:00 2001 From: GERALD NICOLAS Date: Wed, 29 Aug 2018 16:44:40 +0200 Subject: [PATCH] SetSurrentStudy --> UpdateStudy --- doc/files/tutorial_4.xml | 23 +++++++++-------------- doc/files/tutorial_6.xml | 38 ++++++++++++++++++-------------------- doc/files/yacs_01.en.xml | 25 ++++++++++--------------- doc/files/yacs_01.fr.xml | 25 ++++++++++--------------- 4 files changed, 47 insertions(+), 64 deletions(-) mode change 100755 => 100644 doc/files/tutorial_6.xml diff --git a/doc/files/tutorial_4.xml b/doc/files/tutorial_4.xml index 2ccdb22c..fcb633e8 100644 --- a/doc/files/tutorial_4.xml +++ b/doc/files/tutorial_4.xml @@ -58,20 +58,19 @@ CurrentStudy = clt.Resolve("/Study") - + HOMARD - SetCurrentStudy - + UpdateStudy - Etude_Initialisation.SetCurrentStudy + Etude_Initialisation.UpdateStudy CreateHypothesis - Etude_Initialisation.SetCurrentStudy + Etude_Initialisation.UpdateStudy CreateCase @@ -108,14 +107,14 @@ Iter0 = Case.GetIter0() - Etude_Initialisation.SetCurrentStudy + Etude_Initialisation.UpdateStudy CreateBoundaryCAO - Etude_Initialisation.SetCurrentStudy + Etude_Initialisation.UpdateStudy CreateHypothesis @@ -131,8 +130,8 @@ Hypo.AddGroup('T2_EXT') - StudyCreation SetCurrentStudy - SetCurrentStudy CreateBoundaryCAO + StudyCreation UpdateStudy + UpdateStudy CreateBoundaryCAO CreateHypothesis_1 Hypo_Options_1 CreateCase Case_Options Hypo_Options_1 CreateHypothesis_2 @@ -140,10 +139,6 @@ Hypo.AddGroup('T2_EXT') CreateBoundaryCAO CreateCase CreateBoundaryCAO Case_Options CreateHypothesis_2 Hypo_Options_2 - - StudyCreation CurrentStudy - SetCurrentStudy theStudy - CreateHypothesis_1 return Hypo_Options_1 Hypo @@ -439,7 +434,7 @@ else : Hypo_4 - + diff --git a/doc/files/tutorial_6.xml b/doc/files/tutorial_6.xml old mode 100755 new mode 100644 index 542251c9..6d486b87 --- a/doc/files/tutorial_6.xml +++ b/doc/files/tutorial_6.xml @@ -53,20 +53,18 @@ import HOMARD_Zone_idl import HOMARD_Boundary_idl clt = orbmodule.client() -StudyManager = clt.Resolve("/myStudyManager") -CurrentStudy = StudyManager.GetStudyByID(1) +CurrentStudy = clt.Resolve("/Study") ]]> - + HOMARD - SetCurrentStudy - + UpdateStudy - Etude_Initialisation.SetCurrentStudy + Etude_Initialisation.UpdateStudy CreateBoundaryCylinder @@ -79,7 +77,7 @@ CurrentStudy = StudyManager.GetStudyByID(1) - Etude_Initialisation.SetCurrentStudy + Etude_Initialisation.UpdateStudy CreateBoundaryCylinder @@ -92,7 +90,7 @@ CurrentStudy = StudyManager.GetStudyByID(1) - Etude_Initialisation.SetCurrentStudy + Etude_Initialisation.UpdateStudy CreateBoundaryCylinder @@ -105,13 +103,13 @@ CurrentStudy = StudyManager.GetStudyByID(1) - Etude_Initialisation.SetCurrentStudy + Etude_Initialisation.UpdateStudy CreateHypothesis - Etude_Initialisation.SetCurrentStudy + Etude_Initialisation.UpdateStudy CreateCase @@ -153,7 +151,7 @@ Iter0 = Case.GetIter0() - Etude_Initialisation.SetCurrentStudy + Etude_Initialisation.UpdateStudy CreateBoundaryCylinder @@ -166,7 +164,7 @@ Iter0 = Case.GetIter0() - Etude_Initialisation.SetCurrentStudy + Etude_Initialisation.UpdateStudy CreateBoundaryDi @@ -174,7 +172,7 @@ Iter0 = Case.GetIter0() - Etude_Initialisation.SetCurrentStudy + Etude_Initialisation.UpdateStudy CreateHypothesis @@ -190,8 +188,8 @@ Hypo.AddGroup('T2_EXT') - StudyCreation SetCurrentStudy - SetCurrentStudy CreateBoundarycyl_1_int + StudyCreation UpdateStudy + UpdateStudy CreateBoundarycyl_1_int CreateBoundarycyl_1_int CreateBoundarycyl_1_ext CreateBoundarycyl_1_ext CreateBoundarycyl_2_int CreateBoundarycyl_2_int CreateBoundarycyl_2_ext @@ -204,7 +202,7 @@ Hypo.AddGroup('T2_EXT') CreateHypothesis_2 Hypo_Options_2 StudyCreation CurrentStudy - SetCurrentStudy theStudy + UpdateStudy theStudy CreateHypothesis_1 return @@ -330,12 +328,12 @@ FileName = os.path.join(data_dir, "tutorial_4.00.med") # # Maillage de la frontiere # . Nom du maillage -BMeshName = "PIQUAGE" +BMeshName = "COURBES" # . Fichier du maillage BFileName = os.path.join(data_dir, "tutorial_6.fr.med") # -# Répertoire de travail -if os.environ.has_key("LOGNAME") : +# Repertoire de travail +if "LOGNAME" in os.environ : user = os.environ ["LOGNAME"] else : user = "anonymous" @@ -644,7 +642,7 @@ else : - + diff --git a/doc/files/yacs_01.en.xml b/doc/files/yacs_01.en.xml index 83166861..babc556c 100644 --- a/doc/files/yacs_01.en.xml +++ b/doc/files/yacs_01.en.xml @@ -58,17 +58,12 @@ CurrentStudy = clt.Resolve("/Study") ]]> - + HOMARD - SetCurrentStudy - + UpdateStudy - StudyCreation SetCurrentStudy - - StudyCreation CurrentStudy - SetCurrentStudy theStudy - + StudyCreation UpdateStudy @@ -122,7 +117,7 @@ while not Error : # # If the file is not defined, stop: # - if dico_resu.has_key("FileName") : + if ( "FileName" in dico_resu ) : FileName = dico_resu["FileName"] else : MessInfo = "The file for the mesh is not defined." @@ -131,7 +126,7 @@ while not Error : # # If the criterion is satisfied, stop: # - if dico_resu.has_key("V_TEST") : + if ( "V_TEST" in dico_resu ) : valeur_v = dico_resu["V_TEST"] if NumCalc == 0 : resu1 = [valeur_v] @@ -187,13 +182,13 @@ MeshFile = " " - Etude_Initialisation.SetCurrentStudy + Etude_Initialisation.UpdateStudy LastIteration - Etude_Initialisation.SetCurrentStudy + Etude_Initialisation.UpdateStudy GetHypothesis @@ -204,7 +199,7 @@ MeshFile = " " - Etude_Initialisation.SetCurrentStudy + Etude_Initialisation.UpdateStudy CreateCase @@ -225,7 +220,7 @@ Iter0 = Case.GetIter0() - Etude_Initialisation.SetCurrentStudy + Etude_Initialisation.UpdateStudy CreateHypothesis @@ -487,7 +482,7 @@ else : - + diff --git a/doc/files/yacs_01.fr.xml b/doc/files/yacs_01.fr.xml index c384530c..9eda8c33 100644 --- a/doc/files/yacs_01.fr.xml +++ b/doc/files/yacs_01.fr.xml @@ -58,17 +58,12 @@ CurrentStudy = clt.Resolve("/Study") ]]> - + HOMARD - SetCurrentStudy - + UpdateStudy - StudyCreation SetCurrentStudy - - StudyCreation CurrentStudy - SetCurrentStudy theStudy - + StudyCreation UpdateStudy @@ -122,7 +117,7 @@ while not Error : # # Si le fichier n'a pas ete defini, on arrete : # - if dico_resu.has_key("FileName") : + if ( "FileName" in dico_resu ) : FileName = dico_resu["FileName"] else : MessInfo = "Le fichier du maillage n'a pas ete defini" @@ -131,7 +126,7 @@ while not Error : # # Si le critere est respecte, on arrete : # - if dico_resu.has_key("V_TEST") : + if ( "V_TEST" in dico_resu ) : valeur_v = dico_resu["V_TEST"] if NumCalc == 0 : resu1 = [valeur_v] @@ -187,13 +182,13 @@ MeshFile = " " - Etude_Initialisation.SetCurrentStudy + Etude_Initialisation.UpdateStudy LastIteration - Etude_Initialisation.SetCurrentStudy + Etude_Initialisation.UpdateStudy GetHypothesis @@ -204,7 +199,7 @@ MeshFile = " " - Etude_Initialisation.SetCurrentStudy + Etude_Initialisation.UpdateStudy CreateCase @@ -225,7 +220,7 @@ Iter0 = Case.GetIter0() - Etude_Initialisation.SetCurrentStudy + Etude_Initialisation.UpdateStudy CreateHypothesis @@ -487,7 +482,7 @@ else : - + -- 2.39.2