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

Coefficient px,py,pz planes #253

Merged
merged 2 commits into from
Jul 8, 2024
Merged

Coefficient px,py,pz planes #253

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49a40c5
change in coefficient of PX,PY,PZ planes
psauvan Jul 8, 2024
a4f4298
Update functions.py
psauvan Jul 8, 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
27 changes: 15 additions & 12 deletions src/geouned/GEOUNED/write/functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,14 +255,14 @@ def mcnp_surface(id, Type, surf, options, tolerances, numeric_format):
A = surf.Axis.x
B = surf.Axis.y
C = surf.Axis.z
D = surf.Axis.dot(surf.Position)
if surf.Axis.isEqual(FreeCAD.Vector(1, 0, 0), tolerances.pln_angle):
mcnp_def = "{:<6d} PX {:{x}}".format(id, D / 10.0, x=numeric_format.P_xyz)
mcnp_def = "{:<6d} PX {:{x}}".format(id, surf.Position.x / 10.0, x=numeric_format.P_xyz)
elif surf.Axis.isEqual(FreeCAD.Vector(0, 1, 0), tolerances.pln_angle):
mcnp_def = "{:<6d} PY {:{y}}".format(id, D / 10.0, y=numeric_format.P_xyz)
mcnp_def = "{:<6d} PY {:{y}}".format(id, surf.Position.y / 10.0, y=numeric_format.P_xyz)
elif surf.Axis.isEqual(FreeCAD.Vector(0, 0, 1), tolerances.pln_angle):
mcnp_def = "{:<6d} PZ {:{z}}".format(id, D / 10.0, z=numeric_format.P_xyz)
mcnp_def = "{:<6d} PZ {:{z}}".format(id, surf.Position.z / 10.0, z=numeric_format.P_xyz)
else:
D = surf.Axis.dot(surf.Position)
mcnp_def = "{:<6d} P {:{abc}} {:{abc}} {:{abc}} {:{d}}".format(
id,
A,
Expand Down Expand Up @@ -493,8 +493,8 @@ def open_mc_surface(Type, surf, tolerances, numeric_format, out_xml=True, quadri
A = surf.Axis.x
B = surf.Axis.y
C = surf.Axis.z
D = surf.Axis.dot(surf.Position) * 0.1
if surf.Axis.isEqual(FreeCAD.Vector(1, 0, 0), tolerances.pln_angle):
D = surf.Position.x * 0.1
if out_xml:
omc_surf = "x-plane"
coeffs = "{:{x}}".format(D, x=numeric_format.P_xyz)
Expand All @@ -503,6 +503,7 @@ def open_mc_surface(Type, surf, tolerances, numeric_format, out_xml=True, quadri
coeffs = f"x0={D}"

elif surf.Axis.isEqual(FreeCAD.Vector(0, 1, 0), tolerances.pln_angle):
D = surf.Position.y * 0.1
if out_xml:
omc_surf = "y-plane"
coeffs = "{:{x}}".format(D, x=numeric_format.P_xyz)
Expand All @@ -511,6 +512,7 @@ def open_mc_surface(Type, surf, tolerances, numeric_format, out_xml=True, quadri
coeffs = f"y0={D}"

elif surf.Axis.isEqual(FreeCAD.Vector(0, 0, 1), tolerances.pln_angle):
D = surf.Position.z * 0.1
if out_xml:
omc_surf = "z-plane"
coeffs = "{:{x}}".format(D, x=numeric_format.P_xyz)
Expand All @@ -519,6 +521,7 @@ def open_mc_surface(Type, surf, tolerances, numeric_format, out_xml=True, quadri
coeffs = f"z0={D}"

else:
D = surf.Axis.dot(surf.Position) * 0.1
if out_xml:
omc_surf = "plane"
coeffs = "{:{abc}} {:{abc}} {:{abc}} {:{d}}".format(A, B, C, D, abc=numeric_format.P_abc, d=numeric_format.P_d)
Expand Down Expand Up @@ -727,11 +730,11 @@ def serpent_surface(id, Type, surf, options, tolerance, numeric_format):
C = surf.Axis.z
D = surf.Axis.dot(surf.Position)
if surf.Axis.isEqual(FreeCAD.Vector(1, 0, 0), tolerance.pln_angle):
serpent_def = f"surf {id} px {D/10:{numeric_format.P_xyz}}"
serpent_def = f"surf {id} px {surf.Position.x/10:{numeric_format.P_xyz}}"
elif surf.Axis.isEqual(FreeCAD.Vector(0, 1, 0), tolerance.pln_angle):
serpent_def = f"surf {id} py {D/10:{numeric_format.P_xyz}}"
serpent_def = f"surf {id} py {surf.Position.y/10:{numeric_format.P_xyz}}"
elif surf.Axis.isEqual(FreeCAD.Vector(0, 0, 1), tolerance.pln_angle):
serpent_def = f"surf {id} pz {D/10:{numeric_format.P_xyz}}"
serpent_def = f"surf {id} pz {surf.Position.z/10:{numeric_format.P_xyz}}"
else:
serpent_def = f"surf {id} plane {A:{numeric_format.P_d}} {B:{numeric_format.P_d}} {C:{numeric_format.P_d}} {D/10:{numeric_format.P_d}}"

Expand Down Expand Up @@ -869,14 +872,14 @@ def phits_surface(id, Type, surf, options, tolerance, numeric_format):
A = surf.Axis.x
B = surf.Axis.y
C = surf.Axis.z
D = surf.Axis.dot(surf.Position)
if surf.Axis.isEqual(FreeCAD.Vector(1, 0, 0), tolerance.pln_angle):
phits_def = "{:<6d} PX {:{x}}".format(id, D / 10.0, x=numeric_format.P_xyz)
phits_def = "{:<6d} PX {:{x}}".format(id, surf.Position.x / 10.0, x=numeric_format.P_xyz)
elif surf.Axis.isEqual(FreeCAD.Vector(0, 1, 0), tolerance.pln_angle):
phits_def = "{:<6d} PY {:{y}}".format(id, D / 10.0, y=numeric_format.P_xyz)
phits_def = "{:<6d} PY {:{y}}".format(id, surf.Position.y / 10.0, y=numeric_format.P_xyz)
elif surf.Axis.isEqual(FreeCAD.Vector(0, 0, 1), tolerance.pln_angle):
phits_def = "{:<6d} PZ {:{z}}".format(id, D / 10.0, z=numeric_format.P_xyz)
phits_def = "{:<6d} PZ {:{z}}".format(id, surf.Position.z / 10.0, z=numeric_format.P_xyz)
else:
D = surf.Axis.dot(surf.Position)
phits_def = "{:<6d} P {:{abc}} {:{abc}} {:{abc}} {:{d}}".format(
id,
A,
Expand Down
Loading