Commit 653f6304 authored by Elia Merzari's avatar Elia Merzari

Merge branch 'file-pebble-centers' into 'master'

Use points_file option for NearestPointAverage.

See merge request !10
parents de2b17a8 ff3429b6
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -50,9 +50,9 @@ tolerance = 0.00 # Tolerance for pebbles univer
radius_pebble_flibe = radius_pebble_outer+tolerance
# Pebble centers coordinates (x,y,z)
print("Reading pseudo-random pebble centers from file pebble_centers.txt")
pebble_centers = np.loadtxt('pebble_centers.txt', delimiter=' ')
print("File pebble_centers.txt reading completed")
print("Reading pseudo-random pebble centers from file pebble_centers_rescaled.txt")
pebble_centers = np.loadtxt('pebble_centers_rescaled.txt', delimiter=' ')
print("File pebble_centers_rescaled.txt reading completed")
# Vessel Dimensions
vessel_x, vessel_y = (0.0, 0.0)
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -61,12 +61,10 @@ radius_pebble_central = radius_pebble_outer - 0.1 # UCBTH-14-002, Table 2-1; Cis
tolerance = 0.00 # Tolerance for pebbles universe filling
radius_pebble_flibe = radius_pebble_outer+tolerance
# Pebble centers coordinates (x,y,z)
print("Reading pseudo-random pebble centers from file pebble_centers.txt")
pebble_centers = np.loadtxt('list_pebbles_1568.csv', delimiter=',', skiprows=1)[:, 1:]
print("File pebble_centers.txt reading completed")
rescaled_file = 'pebble_centers.txt'
np.savetxt(rescaled_file, pebble_centers.reshape((-1,3)))
print("Saved rescaled centers to " + rescaled_file)
print("Reading pseudo-random pebble centers from file pebble_centers_rescaled.txt")
pebble_centers = np.loadtxt('pebble_centers_rescaled.txt', delimiter=',')
print("File pebble_centers_rescaled.txt reading completed")
rescaled_file = 'pebble_centers_rescaled.txt'
# Vessel
extra_thickness = 12.125 # change this value to set keff=1
x_vessel = 0.0 # x position vessel
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -50,9 +50,9 @@ tolerance = 0.00 # Tolerance for pebbles univer
radius_pebble_flibe = radius_pebble_outer+tolerance
# Pebble centers coordinates (x,y,z)
print("Reading pseudo-random pebble centers from file pebble_centers.txt")
pebble_centers = np.loadtxt('list_pebbles_1568.csv', delimiter=',', skiprows=1)[:, 1:]
print("File pebble_centers.txt reading completed")
print("Reading pseudo-random pebble centers from file pebble_centers_rescaled.txt")
pebble_centers = np.loadtxt('pebble_centers_rescaled.txt', delimiter=',')
print("File pebble_centers_rescaled.txt reading completed")
# Vessel Dimensions
vessel_x, vessel_y = (0.0, 0.0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment