From 67b7bb9438d8e985e36c09606868b3734ceb2eca Mon Sep 17 00:00:00 2001 From: Jon Hill Date: Mon, 28 Nov 2022 19:10:52 +0000 Subject: [PATCH 1/2] minor fixes to both coastline, boundary and meshing script. Works with qmesh3 1.04 --- examples/north_sea/generate_mesh.py | 6 +- examples/north_sea/mesh_data/Boundary.dbf | Bin 1001 -> 1001 bytes examples/north_sea/mesh_data/Boundary.shp | Bin 104284 -> 104332 bytes examples/north_sea/mesh_data/Boundary.shx | Bin 444 -> 444 bytes examples/north_sea/mesh_data/Coastline.dbf | Bin 10614 -> 10614 bytes examples/north_sea/mesh_data/Coastline.shp | Bin 104636 -> 104460 bytes examples/north_sea/mesh_data/Coastline.shx | Bin 492 -> 492 bytes examples/north_sea/north_sea.msh | 37578 +++++++++---------- 8 files changed, 18320 insertions(+), 19264 deletions(-) mode change 100755 => 100644 examples/north_sea/mesh_data/Boundary.shp mode change 100755 => 100644 examples/north_sea/mesh_data/Boundary.shx mode change 100755 => 100644 examples/north_sea/mesh_data/Coastline.shp mode change 100755 => 100644 examples/north_sea/mesh_data/Coastline.shx diff --git a/examples/north_sea/generate_mesh.py b/examples/north_sea/generate_mesh.py index b0e3cf195..456dad6c3 100644 --- a/examples/north_sea/generate_mesh.py +++ b/examples/north_sea/generate_mesh.py @@ -1,5 +1,4 @@ -import qmesh - +import qmesh3 as qmesh def generate_mesh(level): """ @@ -9,7 +8,6 @@ def generate_mesh(level): # Setup qmesh qmesh.setLogOutputFile("qmesh.log") - qmesh.initialise() # Read shapefile describing domain boundaries boundary = qmesh.vector.Shapes() @@ -33,7 +31,7 @@ def generate_mesh(level): gshhs_coast.fromFile("mesh_data/Coastline.shp") gradation_raster = qmesh.raster.gradationToShapes() gradation_raster.setShapes(gshhs_coast) - gradation_raster.setRasterBounds(-16.0, 9.0, 48.0, 64.0) + gradation_raster.setRasterBounds(-16.0, 12.0, 48.0, 64.0) gradation_raster.setRasterResolution(300, 300) gradation_raster.setGradationParameters( 10.0e03 * 0.5**level, # inner gradation (m) diff --git a/examples/north_sea/mesh_data/Boundary.dbf b/examples/north_sea/mesh_data/Boundary.dbf index af486d20473387e279baffaad319fd31256d84fa..a51b98b8b34258cf111357b44e179042f654a66c 100755 GIT binary patch delta 13 UcmaFK{*s-Axr$q6Bg<1}03Un=CIA2c delta 13 UcmaFK{*s-Axr&)@Bg<1}03QYf5C8xG diff --git a/examples/north_sea/mesh_data/Boundary.shp b/examples/north_sea/mesh_data/Boundary.shp old mode 100755 new mode 100644 index 8487065b4dc38f9298c7126151e93fe1f02c09d9..60050f0d920318fb9eabe133a3253cee60c443a6 GIT binary patch delta 185 zcmcb!j;&`s+XQLNV=tH)7=Vc3muA$==T?RXY`%L(d`)$Cu(`v>+r3lG!RUnNDz{|; z4if{#CMK{?OkitF-{(pBtxq~h6ktpoc+J2|toJf^Q_V-#iNn0}OvQQg03 zL#aT%kKloMu1_An{pjxyGu`xS+sZ1vQ#{0gNS^=z delta 137 zcmeBK&vs`W+XQLNbuXA17=VZ&VY2BfMJ9s-0cKCR-v4uVu(`v>+r3lG!Mc4t_xpeT z4if{#CMK{?OkitF-c9etkaLOF{;a>n&|I<%6H#x&CVD&0RTbw BGC%+T diff --git a/examples/north_sea/mesh_data/Boundary.shx b/examples/north_sea/mesh_data/Boundary.shx old mode 100755 new mode 100644 index f7c152b4fda2f8d366f05d7af5530ba78640d1ad..161f142071d2b2d2b637dc5b0d34990a8e939ad3 GIT binary patch delta 118 zcmdnPyoY&$io!3=sF}~L3=i0R_m23Q>h553hmW^=r<#M&3C~q-%K{uG28vBgV4s-4 zwlQ6V(J_L7p?Mht149P`LyHlRE&$RXeg*?Ws}PV*0McbZS_4Qgf{3^AF))}(Ffi=V JVqoB(0RR%hAEp2R delta 118 zcmdnPyoY&$ibBF<(^ra21_uJno^rka=k8#0hmW^=r<#Lx`+Dy8|NI>$28vBgV4s-4 zwlQ6V(b0i{p}CKNfuVzep+yQv7XWDxKLber0@4W#46SiMS_4RTLBw0XF))}(Ffi;9 JVqoB(0RZ>HAc_D0 diff --git a/examples/north_sea/mesh_data/Coastline.dbf b/examples/north_sea/mesh_data/Coastline.dbf index d9536bc3f1ba7a9dda03e1822739fbd44193b552..36318409448a25c73e51634320c5467151d7fb28 100755 GIT binary patch delta 13 Ucmews^eu>mxr$q6BTJDc048Pxi2wiq delta 13 Ucmews^eu>mxr&)@BTJDc044AQa{vGU diff --git a/examples/north_sea/mesh_data/Coastline.shp b/examples/north_sea/mesh_data/Coastline.shp old mode 100755 new mode 100644 index 43fc6b36db3588c4d341246c09c98f5cbd1a88f1..42545db6cbe9ff75ce551b0461041a7376af659c GIT binary patch delta 80 zcmV-W0I&bNu?CE=29O&82C*F10s-ig^a3aWdb1q^HvtZsnVFfHIUztn)>EsmB(s79 mzy<>X-~*F!3lo!A3lsravuz7U0<$y@umXeh5V!OY0mz4tX&lx7 delta 255 zcmeC#z_w>2+XQLGxQ#N`nHYae{=%feShHD{*_=`D>E+~THWNjM6P5qv)it~wX3Ycw zOGO9AYr(76t9Uz1DmnXPwyvUs?YwF7J2W;Yu^eDyX4YVy9LOy^*@9byF=?|ew>wjP zL6!LX<9}rwG-LV?eO=+@@Tg?cTD@>t2lGzHgr`8h{#_Ne#;LLnB8sKfzn6G9OfcYy zC<5~D2s}1jKhMjdaJ2&4u5Gdo_bfEeRL}8p*mUd9{#P?(9U?5ZoG1gzPnK&7Q=cyD zaMu2pn(tCC2cYP_`BAbCAC@2UHeczrc{1-tCcaOXe3Jw?6df2q;6SsJz;-7A##8M8 D7K>$9 diff --git a/examples/north_sea/mesh_data/Coastline.shx b/examples/north_sea/mesh_data/Coastline.shx old mode 100755 new mode 100644 index 2b06abddf706fc4e57d51004c1b2c046c62ba6d5..6d67b95a4626ae4ed5ce55e75a7af6726ef1bb4c GIT binary patch literal 492 zcmZvY&nts*9LHbtV{MCtHJn5=Yo$aBbz57D1gX+&`sTTB7+)3WQfAth{?sa>} zXZS~7osAo}9{)#od2KH<<*&Z}Z#n=L`7Db{EJ6K@PQBtL)VzUhp`vXuF#>jJ2XY5i_knPenX4$ES=z5mDZl?M_N92t8_wqkT#&rDP0nE-WP{)GhaCq zVHlJScR*JJc8}CeNAZ;UO7D-T=QJFsuVokxAH{w}|7vc)@ubYpaH4%~#22v)$tSS@ zsV(`vaGDbna30e93@%K6P>hP(aOn}%CtXv~>6jRYt1)p&)V}Gz_9-U-8TB#mF>|M$ X24t-joz;EU={G;5kLLLmXjuLOC^1wQ literal 492 zcmZvYPbhJuT6-tk&}Ool+s)r9Co4iMh*@RS`JzclEadNTAi!AVX_a#+&ZX{T}YecMTSdwV~>&+~hpZ%;3DSM&c<%$0*)GQr5h=XX~+=~%bT z_8Oj{_qy86JC`TlSydG0}V-0dG>o{w?X5FTyst1a`idp{XA_kAH4HuIG; z@(Kg;B|o$WV7E-W>FS_L`^k^Cp==C}zmzkm$PTd|P9{`0;Pg< Date: Mon, 28 Nov 2022 19:43:14 +0000 Subject: [PATCH 2/2] Adding blank line --- examples/north_sea/generate_mesh.py | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/north_sea/generate_mesh.py b/examples/north_sea/generate_mesh.py index 456dad6c3..aa332fd4f 100644 --- a/examples/north_sea/generate_mesh.py +++ b/examples/north_sea/generate_mesh.py @@ -1,5 +1,6 @@ import qmesh3 as qmesh + def generate_mesh(level): """ Generate a mesh of the North Sea domain using qmesh.