From bde1941c107d56a45d572f2be6a575d392324025 Mon Sep 17 00:00:00 2001 From: Gerald NICOLAS Date: Mon, 5 Mar 2018 14:33:47 +0100 Subject: [PATCH] Correction of english mistakes --- doc/en/glossaire.rst | 2 +- doc/en/gui_create_iteration.rst | 6 +++--- doc/en/tui_create_hypothese.rst | 2 +- doc/en/tui_create_iteration.rst | 2 +- src/HOMARDGUI/CreateHypothesis.ui | 2 +- src/HOMARDGUI/HOMARD_msg_en.ts | 4 ++-- src/HOMARDGUI/HOMARD_msg_fr.ts | 4 ++-- src/HOMARDGUI/HOMARD_msg_ja.ts | 4 ++-- src/HOMARD_I/HOMARD_Gen_i.cxx | 2 +- src/tests/Test/test_6.py | 9 +++++---- 10 files changed, 19 insertions(+), 18 deletions(-) diff --git a/doc/en/glossaire.rst b/doc/en/glossaire.rst index 4587aafc..bf030610 100644 --- a/doc/en/glossaire.rst +++ b/doc/en/glossaire.rst @@ -28,7 +28,7 @@ Glossary An iteration is the process that transform a mesh to another one into a case. An iteration implies refinement and/or unrefinement, following the associated hypothesis. hypothesis - An hypothesis describes the conditions that governs the modification from a mesh to another one: refinement and/or unrefinement, etc. An hypothesis is referenced by 1 or more iterations. + A hypothesis describes the conditions that governs the modification from a mesh to another one: refinement and/or unrefinement, etc. A hypothesis is referenced by 1 or more iterations. field A field is expressed over a mesh, onto node or element, with 1 or more components. diff --git a/doc/en/gui_create_iteration.rst b/doc/en/gui_create_iteration.rst index 3dc07084..979d20fd 100644 --- a/doc/en/gui_create_iteration.rst +++ b/doc/en/gui_create_iteration.rst @@ -33,7 +33,7 @@ The current iteration will produce a mesh. This mesh will be known under a name. The field ********* -To create or use an hypothesis of adaptation based on a field expressed on the mesh, one must provide the file where the field is. It is also the case if one wants to interpolate fields from mesh #N to the mesh #(N+1). This file is with format MED. Classically, it will have been produced by the computation software with which one works. The name of the file can be provided, either by typing the name in the zone of text, or by activating the function of research. +To create or use a hypothesis of adaptation based on a field expressed on the mesh, one must provide the file where the field is. It is also the case if one wants to interpolate fields from mesh #N to the mesh #(N+1). This file is with format MED. Classically, it will have been produced by the computation software with which one works. The name of the file can be provided, either by typing the name in the zone of text, or by activating the function of research. .. image:: images/create_iteration_2.png :align: center @@ -47,14 +47,14 @@ If steps of time were defined, a simple solution consists in treating the fields The hypothesis ************** -The iteration in progress will control the adaptation by HOMARD according to a scenario defined on an hypothesis. This one is selected in the list of the existing hypotheses. +The iteration in progress will control the adaptation by HOMARD according to a scenario defined on a hypothesis. This one is selected in the list of the existing hypotheses. With starting, it is necessary to create a first hypothesis by activation of the button "*New*" (see: :doc:`gui_create_hypothese`) : .. image:: images/create_iteration_4.png :align: center -Then, if an hypothesis previously defined is appropriate, it is enough to select it in the proposed list. If not, it is necessary to create a new hypothesis by activation of the button "*New*", then to select it in the proposed list: +Then, if a hypothesis previously defined is appropriate, it is enough to select it in the proposed list. If not, it is necessary to create a new hypothesis by activation of the button "*New*", then to select it in the proposed list: .. image:: images/create_iteration_5.png :align: center diff --git a/doc/en/tui_create_hypothese.rst b/doc/en/tui_create_hypothese.rst index 58edf273..f5a8192b 100644 --- a/doc/en/tui_create_hypothese.rst +++ b/doc/en/tui_create_hypothese.rst @@ -452,4 +452,4 @@ Similar graphical input Look at :doc:`gui_create_hypothese` .. warning:: - With the graphical input mode, if an hypothesis is edited and if one of the characteristic is modified, the value of the threshold for the refinement for example, all the iterations that were computed with this hypothesis are unvalidated. In python mode, that is not true: the iterations stay as they are. + With the graphical input mode, if a hypothesis is edited and if one of the characteristic is modified, the value of the threshold for the refinement for example, all the iterations that were computed with this hypothesis are unvalidated. In python mode, that is not true: the iterations stay as they are. diff --git a/doc/en/tui_create_iteration.rst b/doc/en/tui_create_iteration.rst index 8309374a..566a0f87 100644 --- a/doc/en/tui_create_iteration.rst +++ b/doc/en/tui_create_iteration.rst @@ -117,7 +117,7 @@ General methods | .. module:: AssociateHypo | | | | **AssociateHypo(hypo_name)** | -| Associate an hypothesis with the iteration | +| Associate a hypothesis with the iteration | | | | - ``hypo_name``: the name of the hypothesis | +---------------------------------------------------------------+ diff --git a/src/HOMARDGUI/CreateHypothesis.ui b/src/HOMARDGUI/CreateHypothesis.ui index 00c65dc8..53698b54 100644 --- a/src/HOMARDGUI/CreateHypothesis.ui +++ b/src/HOMARDGUI/CreateHypothesis.ui @@ -35,7 +35,7 @@ - Create an hypothesis + Create a hypothesis true diff --git a/src/HOMARDGUI/HOMARD_msg_en.ts b/src/HOMARDGUI/HOMARD_msg_en.ts index 26c84aa1..9238ac68 100644 --- a/src/HOMARDGUI/HOMARD_msg_en.ts +++ b/src/HOMARDGUI/HOMARD_msg_en.ts @@ -273,7 +273,7 @@ HOM_ITER_HYPO - An hypothesis must be selected. + A hypothesis must be selected. HOM_ITER_FIELD_FILE @@ -337,7 +337,7 @@ HOM_HYPO_EDIT_WINDOW_TITLE - Edition of an hypothesis + Edition of a hypothesis HOM_ZONE_NAME diff --git a/src/HOMARDGUI/HOMARD_msg_fr.ts b/src/HOMARDGUI/HOMARD_msg_fr.ts index 56140368..b97e3c16 100644 --- a/src/HOMARDGUI/HOMARD_msg_fr.ts +++ b/src/HOMARDGUI/HOMARD_msg_fr.ts @@ -580,7 +580,7 @@ Hypothèse - Create an hypothesis + Create a hypothesis Création d'une hypothèse @@ -996,7 +996,7 @@ Cette itération ne peut pas être détruite. - This zone is used in an hypothesis and cannot be deleted. + This zone is used in a hypothesis and cannot be deleted. Cette zone est utilisée dans une hypothèse ; elle ne peut pas être détruite. diff --git a/src/HOMARDGUI/HOMARD_msg_ja.ts b/src/HOMARDGUI/HOMARD_msg_ja.ts index 963a64dc..68ef2306 100644 --- a/src/HOMARDGUI/HOMARD_msg_ja.ts +++ b/src/HOMARDGUI/HOMARD_msg_ja.ts @@ -569,7 +569,7 @@ Hypothesis - Create an hypothesis + Create a hypothesis hypothesis の作成 @@ -973,7 +973,7 @@ このイテレーションは削除できません。 - This zone is used in an hypothesis and cannot be deleted. + This zone is used in a hypothesis and cannot be deleted. このゾーンはhypothesisで使用されており、削除できません。 diff --git a/src/HOMARD_I/HOMARD_Gen_i.cxx b/src/HOMARD_I/HOMARD_Gen_i.cxx index eca83e69..766af3da 100644 --- a/src/HOMARD_I/HOMARD_Gen_i.cxx +++ b/src/HOMARD_I/HOMARD_Gen_i.cxx @@ -520,7 +520,7 @@ CORBA::Long HOMARD_Gen_i::DeleteZone(const char* nomZone) { SALOME::ExceptionStruct es; es.type = SALOME::BAD_PARAM; - es.text = "This zone is used in an hypothesis and cannot be deleted."; + es.text = "This zone is used in a hypothesis and cannot be deleted."; throw SALOME::SALOME_Exception(es); return 2 ; }; diff --git a/src/tests/Test/test_6.py b/src/tests/Test/test_6.py index a64379b9..d21baf48 100755 --- a/src/tests/Test/test_6.py +++ b/src/tests/Test/test_6.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # -*- coding: utf-8 -*- # Copyright (C) 2011-2016 CEA/DEN, EDF R&D # @@ -21,7 +22,7 @@ Python script for HOMARD Test test_6 """ -__revision__ = "V1.04" +__revision__ = "V1.05" #======================================================================== TEST_NAME = "test_6" @@ -192,8 +193,8 @@ Création du maillage # 5. Export MED # ficmed = os.path.join(rep_mail,'maill.00.med') - texte = "Ecriture du fichier '%s'" % ficmed if verbose : + texte = "Ecriture du fichier '%s'" % ficmed print (texte) maill_00.ExportMED( ficmed, 0, SMESH.MED_V2_2, 1 ) # @@ -239,8 +240,8 @@ Python script for HOMARD le_cas.SetDirName(DIRCASE) le_cas.AddBoundary(cao_name) # - # Creation of the iterations - # ========================== + # Creation des iterations + # ======================= if verbose : option = 2 else : -- 2.39.2