Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the code that makes surfaces compliant with the right hand rule #9771

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open

Fix the code that makes surfaces compliant with the right hand rule #9771

Changes from 3 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
761b4ea
As in my laptop
mmpagani Jun 10, 2024
027d7f5
Merging master and fixing conflicts
mmpagani Jun 10, 2024
190d0cf
More work
mmpagani Jul 8, 2024
86cd4fa
trying to understand right hand rule problems
kirstybayliss Sep 16, 2024
cae196f
removing unused chk_flip
kirstybayliss Sep 16, 2024
82cab7c
Merge origin master
mmpagani Oct 22, 2024
c914a3d
fix comment
mmpagani Oct 22, 2024
573643f
Merge remote-tracking branch 'origin/right_hand' into right_hand
mmpagani Oct 22, 2024
4555eae
More work
mmpagani Oct 22, 2024
cd0168a
Adding more tests
mmpagani Oct 24, 2024
6157ca9
Removing unused variables
mmpagani Oct 24, 2024
f76b7c5
Fixing tests - In the QA 29 the polygon vtx go in the opposite dir
mmpagani Oct 24, 2024
2326e02
Fixing test
mmpagani Oct 25, 2024
48ccaeb
Cleaning
mmpagani Nov 5, 2024
13e3055
Fixing tests
mmpagani Nov 6, 2024
61d542d
Still fixing
mmpagani Nov 6, 2024
4638aeb
Still fixing
mmpagani Nov 6, 2024
91916cf
Still fixing - vertical fault
mmpagani Nov 6, 2024
2e411fa
Cleaning and fixing tests
mmpagani Nov 7, 2024
cfa24d9
Changing (once again) polygon
mmpagani Nov 7, 2024
2a4e549
Update test 75
mmpagani Nov 7, 2024
cad1b00
Increasing tolerance on test 65
mmpagani Nov 7, 2024
6b36136
neverending
mmpagani Nov 7, 2024
3877084
Updated tests
mmpagani Nov 7, 2024
06bf0ec
Merge remote-tracking branch 'origin' into right_hand
mmpagani Nov 7, 2024
26399fe
Updating files
mmpagani Nov 7, 2024
dad5e91
maybe the last one?
mmpagani Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions openquake/hazardlib/geo/surface/kite_fault.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
from openquake.hazardlib.geo.geodetic import (
npoints_towards, distance, azimuth)
from openquake.hazardlib.geo.surface import SimpleFaultSurface
from openquake.hazardlib.geo.surface.gridded import GriddedSurface
#from openquake.hazardlib.geo.surface.gridded import GriddedSurface

TOL = 0.4
SMALL = 1e-5
Expand Down Expand Up @@ -331,10 +331,10 @@ def _fix_right_hand(self):

# Compare the dip direction from the strike against the one from
# the quadrilateral
# tmp = geo_utils._angles_diff(azi_strike, 90)
# if abs(geo_utils._angles_diff(tmp, azi_dip)) < 40:
tmp = (azi_strike + 90.0) % 360
if abs(geo_utils._angles_diff(tmp, azi_dip)) > 40:
tmp = geo_utils._angles_diff(azi_strike, 90)
if abs(geo_utils._angles_diff(tmp, azi_dip)) < 40:
#tmp = (azi_strike + 90.0) % 360
#if abs(geo_utils._angles_diff(tmp, azi_dip)) > 40:
tlo = np.fliplr(self.mesh.lons)
tla = np.fliplr(self.mesh.lats)
tde = np.fliplr(self.mesh.depths)
Expand Down Expand Up @@ -855,7 +855,7 @@ def _dbg_plot_mesh(mesh):
set_axes_equal(ax)
plt.show()


def _fix_right_hand(msh):
# This function checks that the array describing the surface complies with
# the right hand rule and, if required, flips the mesh to make it compliant
Expand All @@ -871,8 +871,9 @@ def _fix_right_hand(msh):
# Flip the grid to make it compliant with the right hand rule
nmsh = np.empty_like(msh)
nmsh[:, :, :] = msh[:, ::-1, :]
chk_flip = ((msh[:, 0, 0] == nmsh[:, -1, 0]) &
(msh[:, 0, 2] == nmsh[:, -1, 2]))

#chk_flip = ((msh[:, 0, 0] == nmsh[:, -1, 0]) &
# (msh[:, 0, 2] == nmsh[:, -1, 2]))

# Check again the average azimuth for the top edge of the surface
msg = "The mesh still does not comply with the right hand rule"
Expand Down
Loading