From 2b479f8b647663444f506763cad6ceff6b029b90 Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Thu, 20 Aug 2020 16:30:03 +0200 Subject: [PATCH] add test case h020_normalCaseChangeBathy.py --- doc/salome/examples/CMakeLists.txt | 2 + .../examples/h020_normalCaseChangeBathy.py | 547 ++++++++++++++++++ src/HYDROTools/interpolZ.py | 5 +- 3 files changed, 552 insertions(+), 2 deletions(-) create mode 100644 doc/salome/examples/h020_normalCaseChangeBathy.py diff --git a/doc/salome/examples/CMakeLists.txt b/doc/salome/examples/CMakeLists.txt index 97c6e197..34960d46 100644 --- a/doc/salome/examples/CMakeLists.txt +++ b/doc/salome/examples/CMakeLists.txt @@ -39,6 +39,7 @@ SET(EXAMPLES_TESTS h017_interpolationLineaire.py h018_streamInterpolation.py h019_normalCaseManualInterpolZStrickler.py + h020_normalCaseChangeBathy.py ) SET(HYDRO_SAMPLES @@ -46,6 +47,7 @@ SET(HYDRO_SAMPLES garonne_ign_02.png Cloud_02.xyz garonne_point_L93.xyz + garonne_point_L93_50m.xyz condlim.bcd init.cas init.lqd diff --git a/doc/salome/examples/h020_normalCaseChangeBathy.py b/doc/salome/examples/h020_normalCaseChangeBathy.py new file mode 100644 index 00000000..6bcbe7b9 --- /dev/null +++ b/doc/salome/examples/h020_normalCaseChangeBathy.py @@ -0,0 +1,547 @@ +# -*- coding: utf-8 -*- + +import os +HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO") + +import sys +import salome + +salome.salome_init() + +#---------------------- +# --- HYDRO +#---------------------- + +from HYDROPy import * +from PyQt5.QtCore import * +from PyQt5.QtGui import * + +hydro_doc = HYDROData_Document.Document() + +hydro_doc.SetLocalCS( 430000, 6.35e+06 ) + +garonne_ign_01 = hydro_doc.CreateObject( KIND_IMAGE ) +garonne_ign_01.SetName( "garonne_ign_01" ) + +garonne_ign_01.SetZLevel( 0 ) + + +if not(garonne_ign_01.LoadImage(os.path.join(HYDRO_SAMPLES, "garonne_ign_01.png" ))): + raise ValueError('problem while loading image') + +garonne_ign_01.SetLocalPoints( QPoint( 40, 817 ), + QPoint( 1325, 85 ) ) + +garonne_ign_01.SetGlobalPoints( 1, + QPointF( 471562, 6.36775e+06 ), + QPointF( 489400, 6.37702e+06 ) ) + +garonne_ign_01.Update() + +garonne_ign_02 = hydro_doc.CreateObject( KIND_IMAGE ) +garonne_ign_02.SetName( "garonne_ign_02" ) + +garonne_ign_02.SetZLevel( 1 ) + + +if not(garonne_ign_02.LoadImage( os.path.join(HYDRO_SAMPLES, "garonne_ign_02.png" ))): + raise ValueError('problem while loading image') + +garonne_ign_02.SetLocalPoints( QPoint( 1389, 447 ), + QPoint( 784, 481 ) ) + +garonne_ign_02.SetGlobalPoints( 3, + QPointF( 631, 95 ), + QPointF( 26, 129 ) ) +garonne_ign_02.SetTrsfReferenceImage( garonne_ign_01 ) + +garonne_ign_02.Update() + +garonne = hydro_doc.CreateObject( KIND_POLYLINEXY ) +garonne.SetName( "garonne" ) + +garonne.SetZLevel( 2 ) + +garonne.AddSection( "Section_1", 1, 1 ) +garonne.AddPoint( 0, gp_XY( 38191.48, 33184.55 ) ) +garonne.AddPoint( 0, gp_XY( 38553.78, 33013.53 ) ) +garonne.AddPoint( 0, gp_XY( 38993.90, 32767.64 ) ) +garonne.AddPoint( 0, gp_XY( 39678.58, 32533.58 ) ) +garonne.AddPoint( 0, gp_XY( 40240.26, 32305.27 ) ) +garonne.AddPoint( 0, gp_XY( 40717.94, 32193.70 ) ) +garonne.AddPoint( 0, gp_XY( 41361.00, 32464.18 ) ) +garonne.AddPoint( 0, gp_XY( 41831.41, 32626.69 ) ) +garonne.AddPoint( 0, gp_XY( 41950.14, 32618.24 ) ) +garonne.AddPoint( 0, gp_XY( 42524.97, 32419.61 ) ) +garonne.AddPoint( 0, gp_XY( 42909.80, 32291.33 ) ) +garonne.AddPoint( 0, gp_XY( 43177.03, 32269.95 ) ) +garonne.AddPoint( 0, gp_XY( 43465.65, 32344.78 ) ) +garonne.AddPoint( 0, gp_XY( 43754.27, 32152.37 ) ) +garonne.AddPoint( 0, gp_XY( 44128.40, 31842.37 ) ) +garonne.AddPoint( 0, gp_XY( 44003.90, 31269.93 ) ) +garonne.AddPoint( 0, gp_XY( 44010.82, 30869.63 ) ) +garonne.AddPoint( 0, gp_XY( 44064.26, 30655.84 ) ) +garonne.AddPoint( 0, gp_XY( 44434.73, 30366.18 ) ) +garonne.AddPoint( 0, gp_XY( 45208.04, 30484.81 ) ) +garonne.AddPoint( 0, gp_XY( 45705.01, 30287.34 ) ) +garonne.AddPoint( 0, gp_XY( 45933.89, 30046.87 ) ) +garonne.AddPoint( 0, gp_XY( 46127.34, 29490.68 ) ) +garonne.AddPoint( 0, gp_XY( 46111.60, 29226.08 ) ) +garonne.AddPoint( 0, gp_XY( 46228.62, 28784.05 ) ) +garonne.AddPoint( 0, gp_XY( 46247.64, 28449.75 ) ) +garonne.AddPoint( 0, gp_XY( 46108.48, 28086.94 ) ) +garonne.AddPoint( 0, gp_XY( 45618.52, 27553.74 ) ) +garonne.AddPoint( 0, gp_XY( 45276.77, 27042.78 ) ) +garonne.AddPoint( 0, gp_XY( 45001.89, 26273.15 ) ) +garonne.AddPoint( 0, gp_XY( 45167.76, 25975.34 ) ) +garonne.AddPoint( 0, gp_XY( 46018.15, 25848.84 ) ) +garonne.AddPoint( 0, gp_XY( 46378.94, 25872.21 ) ) +garonne.AddPoint( 0, gp_XY( 46885.57, 25937.64 ) ) +garonne.AddPoint( 0, gp_XY( 47278.36, 25782.88 ) ) +garonne.AddPoint( 0, gp_XY( 47153.86, 25728.04 ) ) +garonne.AddPoint( 0, gp_XY( 46987.51, 25749.97 ) ) +garonne.AddPoint( 0, gp_XY( 46658.26, 25715.71 ) ) +garonne.AddPoint( 0, gp_XY( 45650.76, 25634.46 ) ) +garonne.AddPoint( 0, gp_XY( 45122.63, 25748.21 ) ) +garonne.AddPoint( 0, gp_XY( 44797.63, 26325.09 ) ) +garonne.AddPoint( 0, gp_XY( 45114.51, 27168.75 ) ) +garonne.AddPoint( 0, gp_XY( 45508.28, 27713.21 ) ) +garonne.AddPoint( 0, gp_XY( 45994.19, 28382.53 ) ) +garonne.AddPoint( 0, gp_XY( 45927.01, 29201.34 ) ) +garonne.AddPoint( 0, gp_XY( 45756.39, 29859.47 ) ) +garonne.AddPoint( 0, gp_XY( 45390.76, 30151.97 ) ) +garonne.AddPoint( 0, gp_XY( 45039.85, 30120.84 ) ) +garonne.AddPoint( 0, gp_XY( 44513.26, 30084.28 ) ) +garonne.AddPoint( 0, gp_XY( 43923.42, 30426.28 ) ) +garonne.AddPoint( 0, gp_XY( 43768.81, 30934.29 ) ) +garonne.AddPoint( 0, gp_XY( 43820.10, 31425.20 ) ) +garonne.AddPoint( 0, gp_XY( 43854.78, 31801.12 ) ) +garonne.AddPoint( 0, gp_XY( 43479.64, 32053.54 ) ) +garonne.AddPoint( 0, gp_XY( 42923.47, 32051.85 ) ) +garonne.AddPoint( 0, gp_XY( 42493.64, 32187.97 ) ) +garonne.AddPoint( 0, gp_XY( 42074.27, 32302.91 ) ) +garonne.AddPoint( 0, gp_XY( 41624.75, 32330.93 ) ) +garonne.AddPoint( 0, gp_XY( 41325.93, 32187.97 ) ) +garonne.AddPoint( 0, gp_XY( 40879.52, 31987.29 ) ) +garonne.AddPoint( 0, gp_XY( 40308.78, 32018.46 ) ) +garonne.AddPoint( 0, gp_XY( 39782.86, 32207.17 ) ) +garonne.AddPoint( 0, gp_XY( 38814.10, 32560.43 ) ) +garonne.AddPoint( 0, gp_XY( 38302.17, 32903.70 ) ) + +garonne.Update() + + +domaine = hydro_doc.CreateObject( KIND_POLYLINEXY ) +domaine.SetName( "domaine" ) + +domaine.SetZLevel( 3 ) + +domaine.AddSection( "Section_1", 0, 1 ) +domaine.AddPoint( 0, gp_XY( 39901.15, 34762.30 ) ); +domaine.AddPoint( 0, gp_XY( 38086.50, 29964.69 ) ); +domaine.AddPoint( 0, gp_XY( 44835.83, 24264.97 ) ); +domaine.AddPoint( 0, gp_XY( 46758.56, 25021.86 ) ); +domaine.AddPoint( 0, gp_XY( 46757.20, 26601.21 ) ); +domaine.AddPoint( 0, gp_XY( 48566.45, 30152.81 ) ); +domaine.AddPoint( 0, gp_XY( 45532.36, 33239.83 ) ); +domaine.AddPoint( 0, gp_XY( 43548.77, 34048.39 ) ); + +domaine.Update() + + +lit_majeur = hydro_doc.CreateObject( KIND_POLYLINEXY ) +lit_majeur.SetName( "lit_majeur" ) + +lit_majeur.SetZLevel( 7 ) + +lit_majeur.AddSection( "Section_1", 1, 1 ) +lit_majeur.AddPoint( 0, gp_XY( 41225.22, 34118.46 ) ) +lit_majeur.AddPoint( 0, gp_XY( 41716.41, 33705.87 ) ) +lit_majeur.AddPoint( 0, gp_XY( 42384.43, 33293.27 ) ) +lit_majeur.AddPoint( 0, gp_XY( 42561.26, 32684.19 ) ) +lit_majeur.AddPoint( 0, gp_XY( 42875.62, 32369.83 ) ) +lit_majeur.AddPoint( 0, gp_XY( 43700.82, 32350.18 ) ) +lit_majeur.AddPoint( 0, gp_XY( 44526.02, 31662.51 ) ) +lit_majeur.AddPoint( 0, gp_XY( 45370.87, 31819.69 ) ) +lit_majeur.AddPoint( 0, gp_XY( 46274.66, 31682.16 ) ) +lit_majeur.AddPoint( 0, gp_XY( 46981.97, 31328.50 ) ) +lit_majeur.AddPoint( 0, gp_XY( 47021.27, 30719.43 ) ) +lit_majeur.AddPoint( 0, gp_XY( 47217.74, 30051.41 ) ) +lit_majeur.AddPoint( 0, gp_XY( 47846.46, 29560.22 ) ) +lit_majeur.AddPoint( 0, gp_XY( 48730.61, 28735.02 ) ) +lit_majeur.AddPoint( 0, gp_XY( 48809.20, 27732.99 ) ) +lit_majeur.AddPoint( 0, gp_XY( 49143.21, 27163.21 ) ) +lit_majeur.AddPoint( 0, gp_XY( 49654.05, 26829.20 ) ) +lit_majeur.AddPoint( 0, gp_XY( 49693.34, 25355.63 ) ) +lit_majeur.AddPoint( 0, gp_XY( 48612.72, 23214.04 ) ) +lit_majeur.AddPoint( 0, gp_XY( 47453.51, 23115.80 ) ) +lit_majeur.AddPoint( 0, gp_XY( 46471.13, 24176.77 ) ) +lit_majeur.AddPoint( 0, gp_XY( 45960.29, 25257.39 ) ) +lit_majeur.AddPoint( 0, gp_XY( 44899.32, 25591.40 ) ) +lit_majeur.AddPoint( 0, gp_XY( 44270.60, 26573.78 ) ) +lit_majeur.AddPoint( 0, gp_XY( 43248.92, 27909.82 ) ) +lit_majeur.AddPoint( 0, gp_XY( 42757.73, 28243.83 ) ) +lit_majeur.AddPoint( 0, gp_XY( 42266.54, 28342.07 ) ) +lit_majeur.AddPoint( 0, gp_XY( 41736.06, 28106.30 ) ) +lit_majeur.AddPoint( 0, gp_XY( 41402.05, 28833.26 ) ) +lit_majeur.AddPoint( 0, gp_XY( 40910.86, 28911.85 ) ) +lit_majeur.AddPoint( 0, gp_XY( 40576.85, 29324.45 ) ) +lit_majeur.AddPoint( 0, gp_XY( 40144.60, 29599.51 ) ) +lit_majeur.AddPoint( 0, gp_XY( 39024.69, 30130.00 ) ) +lit_majeur.AddPoint( 0, gp_XY( 38612.09, 30365.77 ) ) +lit_majeur.AddPoint( 0, gp_XY( 38828.21, 33391.50 ) ) + +lit_majeur.Update() + + +Cloud_02 = hydro_doc.CreateObject( KIND_BATHYMETRY ) +Cloud_02.SetName( "Cloud_02" ) + +Cloud_02.SetAltitudesInverted( 0 ) +if not(Cloud_02.ImportFromFile( os.path.join(HYDRO_SAMPLES, "Cloud_02.xyz" ))): + raise ValueError('problem while loading bathymetry') + +Cloud_02.Update() + + +garonne_point_L93 = hydro_doc.CreateObject( KIND_BATHYMETRY ) +garonne_point_L93.SetName( "garonne_point_L93" ) + +garonne_point_L93.SetAltitudesInverted( 0 ) +if not(garonne_point_L93.ImportFromFile( os.path.join(HYDRO_SAMPLES, "garonne_point_L93.xyz" ))): + raise ValueError('problem while loading bathymetry') + +garonne_point_L93.Update() + + +litMineur = hydro_doc.CreateObject( KIND_IMMERSIBLE_ZONE ) +litMineur.SetName( "litMineur" ) + +litMineur.SetZLevel( 6 ) + +litMineur.SetAltitudeObject( garonne_point_L93 ) +litMineur.SetPolyline( garonne ) + +litMineur.Update() + + +litMajeur = hydro_doc.CreateObject( KIND_IMMERSIBLE_ZONE ) +litMajeur.SetName( "litMajeur" ) + +litMajeur.SetZLevel( 5 ) + +litMajeur.SetFillingColor( QColor( 0, 170, 127, 255 ) ) + +litMajeur.SetAltitudeObject( garonne_point_L93 ) +litMajeur.SetPolyline( lit_majeur ) + +litMajeur.Update() + + +domaineEtendu = hydro_doc.CreateObject( KIND_IMMERSIBLE_ZONE ) +domaineEtendu.SetName( "domaineEtendu" ) + +domaineEtendu.SetZLevel( 4 ) + +domaineEtendu.SetFillingColor( QColor( 201, 203, 55, 255 ) ) + +domaineEtendu.SetAltitudeObject( Cloud_02 ) +domaineEtendu.SetPolyline( domaine ) + +domaineEtendu.Update() + + +# Calculation case +garonne_1 = hydro_doc.CreateObject( KIND_CALCULATION ) +garonne_1.SetName( "garonne_1" ) + +garonne_1.SetAssignmentMode( HYDROData_CalculationCase.MANUAL ) +garonne_1.AddGeometryObject( litMineur ) +garonne_1.AddGeometryObject( domaineEtendu ) +garonne_1.AddGeometryObject( litMajeur ) + +case_geom_group = domaineEtendu.GetGroup( 0 ) +garonne_1.AddGeometryGroup( case_geom_group ) +case_geom_group = litMineur.GetGroup( 0 ) +garonne_1.AddGeometryGroup( case_geom_group ) +case_geom_group = litMajeur.GetGroup( 0 ) +garonne_1.AddGeometryGroup( case_geom_group ) +garonne_1.SetBoundaryPolyline( domaine ) + +# Start the algorithm of the partition and assignment +garonne_1.Update() +garonne_1_litMineur = hydro_doc.FindObjectByName( "garonne_1_Reg_1" ) +garonne_1_Zone_1 = hydro_doc.FindObjectByName( "garonne_1_Zone_1" ) +garonne_1_Zone_1.SetMergeType( HYDROData_Zone.Merge_ZMIN ) +garonne_1_Zone_1.SetColor( QColor( 192, 113, 64 )) +garonne_1_litMineur.AddZone( garonne_1_Zone_1 ) + +garonne_1_riveDroite = hydro_doc.FindObjectByName( "garonne_1_Reg_2" ) +garonne_1_Zone_2 = hydro_doc.FindObjectByName( "garonne_1_Zone_2" ) +garonne_1_Zone_2.SetColor( QColor( 141, 192, 64 )) +garonne_1_riveDroite.AddZone( garonne_1_Zone_2 ) + +garonne_1_Zone_3 = hydro_doc.FindObjectByName( "garonne_1_Zone_3" ) +garonne_1_Zone_3.SetMergeType( HYDROData_Zone.Merge_Object ) +Cloud_02 = hydro_doc.FindObjectByName( "Cloud_02" ) +garonne_1_Zone_3.SetMergeObject( Cloud_02 ) +garonne_1_Zone_3.SetColor( QColor( 64, 192, 77 )) +garonne_1_riveDroite.AddZone( garonne_1_Zone_3 ) + +garonne_1_riveGauche = hydro_doc.FindObjectByName( "garonne_1_Reg_3" ) +garonne_1_Zone_4 = hydro_doc.FindObjectByName( "garonne_1_Zone_4" ) +garonne_1_Zone_4.SetMergeType( HYDROData_Zone.Merge_Object ) +Cloud_02 = hydro_doc.FindObjectByName( "Cloud_02" ) +garonne_1_Zone_4.SetMergeObject( Cloud_02 ) +garonne_1_Zone_4.SetColor( QColor( 64, 75, 192 )) +garonne_1_riveGauche.AddZone( garonne_1_Zone_4 ) + +garonne_1_Zone_5 = hydro_doc.FindObjectByName( "garonne_1_Zone_5" ) +garonne_1_Zone_5.SetColor( QColor( 64, 192, 77 )) +garonne_1_riveGauche.AddZone( garonne_1_Zone_5 ) + +garonne_1_litMineur.SetName("garonne_1_litMineur") +garonne_1_riveDroite.SetName("garonne_1_riveDroite") +garonne_1_riveGauche.SetName("garonne_1_riveGauche") + +# Export of the calculation case +garonne_1_entry = garonne_1.Export() + +# --- add a new bathymetry for 'litMineur' + +import tempfile +tmpdir = tempfile.mkdtemp() +print("tmpdir=",tmpdir) + +newBathy = os.path.join(tmpdir, 'newBathy.xyz') +fi=open(os.path.join(HYDRO_SAMPLES, "garonne_point_L93.xyz" ), 'r') +fo=open(newBathy, 'w') +for ligne in fi: + vals = ligne.split() + if len(vals) < 3: + continue + x = float(vals[0]) + y = float(vals[1]) + z = float(vals[2]) + 50 + l = "%12.3f %12.3f %12.3f\n" % (x, y, z) + fo.write(l) +fi.close() +fo.close() + +nomBathy = "garonne_point_L93_50m" +garonne_point_L93_50m = hydro_doc.CreateObject( KIND_BATHYMETRY ) +garonne_point_L93_50m.SetName( nomBathy ) + +garonne_point_L93_50m.SetAltitudesInverted( 0 ) +if not(garonne_point_L93_50m.ImportFromFile( newBathy )): + raise ValueError('problem while loading bathymetry') + +garonne_point_L93_50m.Update() + +#---------------------- +# --- Geometry +#---------------------- + +# Get geometry shape and print debug information +import GEOM +from salome.geom import geomBuilder +import math +import SALOMEDS +from salome.hydrotools.controls import controlGeomProps + +geompy = geomBuilder.New() + +print("Entry:", garonne_1_entry) +HYDRO_garonne_1 = salome.IDToObject( str( garonne_1_entry ) ) +print("Geom shape:", HYDRO_garonne_1) +print("Geom shape name:", HYDRO_garonne_1.GetName()) + +# --- manual definition: geometrical faces + +[garonne_litMineur,garonne_riveDroite,garonne_riveGauche] = geompy.SubShapeAll(HYDRO_garonne_1, geompy.ShapeType["FACE"]) + +controlGeomProps(geompy, garonne_riveGauche, 29149.36918, 35948828.352061) +controlGeomProps(geompy, garonne_litMineur, 30337.548492, 3488480.304388) +controlGeomProps(geompy, garonne_riveDroite, 32012.343241, 25998769.23615) + +# --- manual identification of all useful edge groups (boundary conditions) + +allEdgesIds = geompy.SubShapeAllIDs(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) +print("allEdgesIds", allEdgesIds) + +(isDone, ClosedFreeBoundary, OpenFreeBoundary) = geompy.GetFreeBoundary(HYDRO_garonne_1) +geompy.addToStudyInFather(HYDRO_garonne_1, ClosedFreeBoundary[0], "ClosedFreeBoundary") + +freeBoundary = geompy.ExtractShapes(ClosedFreeBoundary[0], geompy.ShapeType["EDGE"], True) +freeBoundaryIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, freeBoundary[i]) for i in range(len(freeBoundary)) ] +print("freeBoundaryIds", freeBoundaryIds) + +[litMineur_droite] = geompy.GetSharedShapesMulti([garonne_riveDroite, garonne_litMineur], geompy.ShapeType["EDGE"], True) +[litMineur_gauche] = geompy.GetSharedShapesMulti([garonne_riveGauche, garonne_litMineur], geompy.ShapeType["EDGE"], True) +geompy.addToStudyInFather(HYDRO_garonne_1, litMineur_droite, "litMineur_droite") +geompy.addToStudyInFather(HYDRO_garonne_1, litMineur_gauche, "litMineur_gauche") +rives = [litMineur_droite, litMineur_gauche] +rivesIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, rives[i]) for i in range(len(rives)) ] +print("rivesIds", rivesIds) + +edges_litMineur = geompy.GetSharedShapesMulti([HYDRO_garonne_1, garonne_litMineur], geompy.ShapeType["EDGE"], True) +edges_riveGauche = geompy.GetSharedShapesMulti([HYDRO_garonne_1, garonne_riveGauche], geompy.ShapeType["EDGE"], True) +edges_riveDroite = geompy.GetSharedShapesMulti([HYDRO_garonne_1, garonne_riveDroite], geompy.ShapeType["EDGE"], True) +edges_litMineurIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_litMineur[i]) for i in range(len(edges_litMineur)) ] +edges_riveGaucheIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveGauche[i]) for i in range(len(edges_riveGauche)) ] +edges_riveDroiteIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveDroite[i]) for i in range(len(edges_riveDroite)) ] + +print("edges_litMineurIds", edges_litMineurIds) +print("edges_riveGaucheIds", edges_riveGaucheIds) +print("edges_riveDroiteIds", edges_riveDroiteIds) + +sectionsIds = [Id for Id in edges_litMineurIds if Id not in rivesIds] +print("sectionsIds", sectionsIds) +SectionsGaronne = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) +geompy.UnionIDs(SectionsGaronne, sectionsIds) +geompy.addToStudyInFather(HYDRO_garonne_1, SectionsGaronne, "SectionsGaronne") + +bordGaucheDomaineIds = [Id for Id in freeBoundaryIds if Id in edges_riveGaucheIds] +bordDroiteDomaineIds = [Id for Id in freeBoundaryIds if Id in edges_riveDroiteIds] +print("bordGaucheDomaineIds", bordGaucheDomaineIds) +print("bordDroiteDomaineIds", bordDroiteDomaineIds) +bordGaucheDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) +geompy.UnionIDs(bordGaucheDomaine, bordGaucheDomaineIds) +geompy.addToStudyInFather(HYDRO_garonne_1, bordGaucheDomaine, "bordGaucheDomaine") +bordDroiteDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) +geompy.UnionIDs(bordDroiteDomaine, bordDroiteDomaineIds) +geompy.addToStudyInFather(HYDRO_garonne_1, bordDroiteDomaine, "bordDroiteDomaine") + +amont = geompy.GetEdgeNearPoint(HYDRO_garonne_1, geompy.MakeVertex(46757.861314, 25833.234752, 0)) +aval = geompy.GetEdgeNearPoint(HYDRO_garonne_1, geompy.MakeVertex(39078.979127, 32588.627279, 0)) +geompy.addToStudyInFather(HYDRO_garonne_1, amont, "amont") +geompy.addToStudyInFather(HYDRO_garonne_1, aval, "aval") + +#---------------------- +# --- Meshing +#---------------------- + +import SMESH, SALOMEDS +from salome.smesh import smeshBuilder +from salome.hydrotools.controls import controlMeshStats, controlSubMeshStats + +smesh = smeshBuilder.New() + +# --- algorithms and hypothesis +garonne_1 = smesh.Mesh(HYDRO_garonne_1) + +NETGEN_2D = garonne_1.Triangle(algo=smeshBuilder.NETGEN_1D2D) +NETGEN_2D_Parameters = NETGEN_2D.Parameters() +NETGEN_2D_Parameters.SetMaxSize( 200 ) +NETGEN_2D_Parameters.SetSecondOrder( 0 ) +NETGEN_2D_Parameters.SetOptimize( 1 ) +NETGEN_2D_Parameters.SetFineness( 4 ) +NETGEN_2D_Parameters.SetMinSize( 50 ) +NETGEN_2D_Parameters.SetUseSurfaceCurvature( 1 ) +NETGEN_2D_Parameters.SetFuseEdges( 1 ) +NETGEN_2D_Parameters.SetQuadAllowed( 0 ) + +algo2D_litMineur = garonne_1.Quadrangle(algo=smeshBuilder.QUAD_MA_PROJ,geom=garonne_litMineur) +algo1D_litMineur = garonne_1.Segment(geom=garonne_litMineur) +hypo1D_litMineur = algo1D_litMineur.LocalLength(100,None,1e-07) +subMesh_litMineur = algo1D_litMineur.GetSubMesh() +smesh.SetName(subMesh_litMineur, "litMineur") + +algo1D_SectionsGaronne = garonne_1.Segment(geom=SectionsGaronne) +hypo1D_SectionsGaronne = algo1D_SectionsGaronne.NumberOfSegments(8) +hypo1D_SectionsGaronne.SetDistrType( 0 ) +subMesh_SectionsGaronne = algo1D_SectionsGaronne.GetSubMesh() +smesh.SetName(subMesh_SectionsGaronne, "SectionsGaronne") + +isDone = garonne_1.SetMeshOrder( [ [ subMesh_SectionsGaronne, subMesh_litMineur ] ]) + +# --- compute mesh +isDone = garonne_1.Compute() +isDone = garonne_1.SplitQuadObject( garonne_1, 1 ) +isDone = garonne_1.ReorientObject( garonne_1 ) + +# --- geometrical groups of faces +riveGauche_1 = garonne_1.GroupOnGeom(garonne_riveGauche,'riveGauche',SMESH.FACE) +litMineur_1 = garonne_1.GroupOnGeom(garonne_litMineur,'litMineur',SMESH.FACE) +riveDroite_1 = garonne_1.GroupOnGeom(garonne_riveDroite,'riveDroite',SMESH.FACE) + +# --- geometrical groups of edges + +ClosedFreeBoundary_1 = garonne_1.GroupOnGeom(ClosedFreeBoundary[0],'ClosedFreeBoundary',SMESH.EDGE) +litMineur_droite_1 = garonne_1.GroupOnGeom(litMineur_droite,'litMineur_droite',SMESH.EDGE) +litMineur_gauche_1 = garonne_1.GroupOnGeom(litMineur_gauche,'litMineur_gauche',SMESH.EDGE) +SectionsGaronne_1 = garonne_1.GroupOnGeom(SectionsGaronne,'SectionsGaronne',SMESH.EDGE) +bordGaucheDomaine_1 = garonne_1.GroupOnGeom(bordGaucheDomaine,'bordGaucheDomaine',SMESH.EDGE) +bordDroiteDomaine_1 = garonne_1.GroupOnGeom(bordDroiteDomaine,'bordDroiteDomaine',SMESH.EDGE) +amont_1 = garonne_1.GroupOnGeom(amont,'amont',SMESH.EDGE) +aval_1 = garonne_1.GroupOnGeom(aval,'aval',SMESH.EDGE) + +# --- geometrical groups of nodes + +garonne_1_litMineur_2 = garonne_1.GroupOnGeom(garonne_litMineur,'garonne_1_litMineur',SMESH.NODE) +garonne_1_riveDroite_2 = garonne_1.GroupOnGeom(garonne_riveDroite,'garonne_1_riveDroite',SMESH.NODE) +garonne_1_riveGauche_2 = garonne_1.GroupOnGeom(garonne_riveGauche,'garonne_1_riveGauche',SMESH.NODE) +ClosedFreeBoundary_2 = garonne_1.GroupOnGeom(ClosedFreeBoundary[0],'ClosedFreeBoundary',SMESH.NODE) +litMineur_droite_2 = garonne_1.GroupOnGeom(litMineur_droite,'litMineur_droite',SMESH.NODE) +litMineur_gauche_2 = garonne_1.GroupOnGeom(litMineur_gauche,'litMineur_gauche',SMESH.NODE) +SectionsGaronne_2 = garonne_1.GroupOnGeom(SectionsGaronne,'SectionsGaronne',SMESH.NODE) +bordGaucheDomaine_2 = garonne_1.GroupOnGeom(bordGaucheDomaine,'bordGaucheDomaine',SMESH.NODE) +bordDroiteDomaine_2 = garonne_1.GroupOnGeom(bordDroiteDomaine,'bordDroiteDomaine',SMESH.NODE) +amont_2 = garonne_1.GroupOnGeom(amont,'amont',SMESH.NODE) +aval_2 = garonne_1.GroupOnGeom(aval,'aval',SMESH.NODE) + +garonne_1.SetAutoColor( 1 ) +fichierMaillage = os.path.join(tmpdir, 'garonne_1.med') +garonne_1.ExportMED(fichierMaillage, 0, SMESH.MED_V2_2, 1, None ,1) + +controlMeshStats(garonne_1, 3888, 475, 7597) +controlSubMeshStats(litMineur_1, 2384) +controlSubMeshStats(riveDroite_1, 2342) +controlSubMeshStats(riveGauche_1, 2871) + +if salome.sg.hasDesktop(): + salome.sg.updateObjBrowser() + +#---------------------- +# --- Z interpolation with HYDRO +#---------------------- + +from salome.hydrotools.interpolZ import interpolZ +from salome.hydrotools.controls import controlStatZ + +# --- case name in HYDRO +nomCas = 'garonne_1' + +# --- med file 2D(x,y) of the case produced by SMESH + +# --- dictionary [med group name] = region name +dicoGroupeRegion= dict(litMineur = 'garonne_1_litMineur', + riveDroite = 'garonne_1_riveDroite', + riveGauche = 'garonne_1_riveGauche', + ) +# --- value to use for Z when the node is not in a region (used to detect problems) +zUndef = 90 +# --- interpolation Method: 0 = nearest point on bathymetry (default), 1 = linear interpolation +interpolMethod = 0 +# --- produce a 3D mesh (Z set to its value instead of 0 +m3d = True + +# --- Z interpolation on the bathymety/altimetry on the mesh nodes +statz = interpolZ(nomCas, fichierMaillage, dicoGroupeRegion, zUndef, interpolMethod, m3d) +#print(statz) +refstatz = {'riveDroite': (10.88, 32.61, 24.17, 5.12, 17.57, 31.33, 0.25), + 'riveGauche': (7.72, 71.86, 24.51, 12.18, 12.90, 60.36, 0.25), + 'litMineur': (2.06, 25.41, 13.93, 4.33, 8.47, 21.78)} +controlStatZ(statz, refstatz) + +# --- interpolation on a new bathymetry for 'litMineur' + +newMesh = os.path.splitext(fichierMaillage)[0] + 'F.med' +from salome.hydrotools.interpolZ import interpolZ_B + +# --- Z interpolation on the bathymety/altimetry on the mesh nodes +statz = interpolZ_B(nomBathy, newMesh, 'litMineur', zUndef, interpolMethod, m3d) +print(statz) +refstatz = {'litMineur': (52.06, 75.68, 64.44, 4.84, 58.47, 72.73)} +controlStatZ(statz, refstatz) + diff --git a/src/HYDROTools/interpolZ.py b/src/HYDROTools/interpolZ.py index 81a802be..d26051ba 100644 --- a/src/HYDROTools/interpolZ.py +++ b/src/HYDROTools/interpolZ.py @@ -381,6 +381,7 @@ def interpolZ_B(bathyName, fichierMaillage, gr_face_name, zUndef=-100., interp_m Option: Z value also in Z coordinate if m3D is true return .xyz : text file with X, Y, Z values """ + statz = dict() doc = HYDROPy.HYDROData_Document.Document() bathy_obj = doc.FindObjectByName(bathyName) print( "bathy : ", bathy_obj) @@ -506,7 +507,7 @@ def interpolZ_B(bathyName, fichierMaillage, gr_face_name, zUndef=-100., interp_m # # 4.4. Storage of the z and of the statistics for this region # - statz_gr_face_name = (minz, maxz, meanz, stdz, v05z, v95z) + statz[gr_face_name] = (minz, maxz, meanz, stdz, v05z, v95z) # for iaux, nodeId in enumerate(np_aux[0]): bathy[nodeId] = vz[iaux] @@ -592,4 +593,4 @@ def interpolZ_B(bathyName, fichierMaillage, gr_face_name, zUndef=-100., interp_m fMEDFile_ch_d.setFieldNoProfileSBT(fieldOnNodes) fMEDFile_ch_d.write(fichierFMaillage, 0) # - return statz_gr_face_name + return statz -- 2.39.2