From: Paul RASCLE Date: Thu, 6 Jul 2017 11:17:30 +0000 (+0200) Subject: replace 'BOTTOM_FRICTION' by 'BOTTOM FRICTION' X-Git-Tag: Salome_8_3_Hydro_1_1rc1~4 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=bde902823151918d13e462d8dbe9a478d9e18a34;p=modules%2Fhydro.git replace 'BOTTOM_FRICTION' by 'BOTTOM FRICTION' --- diff --git a/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py b/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py index e1fedc24..c4442e85 100644 --- a/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py +++ b/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py @@ -796,7 +796,7 @@ controlStatZ(statz, refstatz) # --- add a field on nodes of type double with z values, named "BOTTOM" createZfield2(fichierMaillage) -# --- create a field on nodes of type double with srtickler coefficient values, named "BOTTOM_FRICTION" +# --- create a field on nodes of type double with srtickler coefficient values, named "BOTTOM FRICTION" from salome.hydrotools.interpolS import assignStrickler fichierFieldZ = os.path.join(tmpdir, 'garonne_1F.med') diff --git a/doc/salome/tutorial/english/english_landCoverMap.rst b/doc/salome/tutorial/english/english_landCoverMap.rst index c4f1a7e8..22b75473 100644 --- a/doc/salome/tutorial/english/english_landCoverMap.rst +++ b/doc/salome/tutorial/english/english_landCoverMap.rst @@ -128,7 +128,7 @@ We continue with the *Next>* and *Finish* buttons to validate the case. Creating a Strickler field at mesh nodes ======================================== -TELEMAC can use a field of Strickler coefficients at the nodes of the mesh. This field has the name *BOTTOM_FRICTION*. +TELEMAC can use a field of Strickler coefficients at the nodes of the mesh. This field has the name *BOTTOM FRICTION*. This field is added to the MED file of the mesh, such as the elevation field at the nodes. You have to manually adapt the script below: diff --git a/doc/salome/tutorial/interpolStrickler.py b/doc/salome/tutorial/interpolStrickler.py index 8bac9e61..80fc6cb4 100644 --- a/doc/salome/tutorial/interpolStrickler.py +++ b/doc/salome/tutorial/interpolStrickler.py @@ -11,4 +11,4 @@ fichierMaillage = '/tmp/garonne_1F.med' from salome.hydrotools.interpolS import assignStrickler -assignStrickler(nomCas, fichierMaillage, '/tmp/garonne_1F.med', 'BOTTOM_FRICTION') +assignStrickler(nomCas, fichierMaillage, '/tmp/garonne_1F.med', 'BOTTOM FRICTION') diff --git a/doc/salome/tutorial/landCoverMap.rst b/doc/salome/tutorial/landCoverMap.rst index 608aee52..bce8d6c8 100644 --- a/doc/salome/tutorial/landCoverMap.rst +++ b/doc/salome/tutorial/landCoverMap.rst @@ -128,7 +128,7 @@ Nous poursuivons avec les boutons *Next>* et *Finish* pour valider le cas. Création d'un champ de Strickler aux noeuds du maillage ======================================================= -Telemac exploite un champ des coefficients de Strickler aux noeuds du maillage. Ce champ a pour nom *BOTTOM_FRICTION*. +Telemac exploite un champ des coefficients de Strickler aux noeuds du maillage. Ce champ a pour nom *BOTTOM FRICTION*. Ce champ est ajouté au fichier MED du maillage, comme le champ d'altitude aux noeuds. Il faut adapter manuellement le script ci-dessous : diff --git a/src/HYDROTools/interpolS.py b/src/HYDROTools/interpolS.py index 587a45d5..3376db44 100644 --- a/src/HYDROTools/interpolS.py +++ b/src/HYDROTools/interpolS.py @@ -30,7 +30,7 @@ med_file_name: path to input MED file with mesh on nodes output_file_name: path to output MED file with med_field_name: field name """ -def assignStrickler(case_name, med_file_name, output_file_name, med_field_name='FRICTION'): +def assignStrickler(case_name, med_file_name, output_file_name, med_field_name='BOTTOM FRICTION'): # Check calculation case doc = HYDROPy.HYDROData_Document.Document( theStudyId ) case = doc.FindObjectByName(case_name)