mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
Scenarios: Merge branch 'master' into scenarios.
This commit is contained in:
commit
0f6709075f
25 files changed
+597
-122
No files matched your search
@@ -66,7 +66,6 @@ class InternalMeshing(AMeshingTool):
|
||||
return new_profiles
|
||||
|
||||
def st_to_m(self, profiles, guide_list):
|
||||
|
||||
guide_list = ["un"] + guide_list + ["np"]
|
||||
max_values = [0] * (len(guide_list) - 1)
|
||||
max_values_index = [0] * (len(guide_list) - 1)
|
||||
@@ -85,11 +84,13 @@ class InternalMeshing(AMeshingTool):
|
||||
profiles[isect+1],
|
||||
guide_list[i],
|
||||
guide_list[i+1])
|
||||
|
||||
for isect in reversed(range(0, max_values_index[i])):
|
||||
self.compl_sect(profiles[isect+1],
|
||||
profiles[isect],
|
||||
guide_list[i],
|
||||
guide_list[i+1])
|
||||
|
||||
return profiles
|
||||
|
||||
def interpolate_transversal_step(self,
|
||||
@@ -129,6 +130,7 @@ class InternalMeshing(AMeshingTool):
|
||||
p.name = f'interpol{p.rk}'
|
||||
new_profiles2.append(p)
|
||||
new_profiles.append(new_profiles2)
|
||||
|
||||
return new_profiles
|
||||
|
||||
def compl_sect(self, sect1, sect2, tag1, tag2):
|
||||
@@ -243,8 +245,9 @@ class InternalMeshing(AMeshingTool):
|
||||
sect2.point(start2+len2).name = ''
|
||||
if tag1 != "un":
|
||||
sect2.point(start2).name = tag1
|
||||
if tag1 != "np":
|
||||
if tag2 != "np":
|
||||
sect2.point(start2+len2).name = tag2
|
||||
|
||||
sect2.modified()
|
||||
|
||||
def update_rk(self, reach, begin_rk, end_rk,
|
||||
|
||||
Reference in new issue
Block a user