kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

First simulator draft version.

Browse Source
This commit is contained in:
Jose Luis Cercós Pita
2012-08-07 12:59:34 +02:00
committed by Yorik van Havre
parent 6dabcd3546
commit 3ed62c5bc6
14 changed files with 2684 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/Mod/Ship/simRun/Sim/fsEvolution.py
View File

@@ -57,24 +57,47 @@ class simFSEvolution:
# Get value at pos using characteristics method
gradVal = np.dot(np.abs(grad[i*ny+j]),grad[i*ny+j])
gradVal = np.copysign(np.sqrt(np.abs(gradVal)), gradVal)
self.fs['pos'][i,j][2] = self.fs['pos'][i,j][2] + \
dt*np.linalg.norm(grad[i*ny+j])
# Free surface points position
self.fs['pos'][i,j][2] = self.fs['pos'][i,j][2] + dt*grad[i*ny+j][2]
self.fs['pos'][i,j][2] = self.fs['pos'][i,j][2] + dt*gradVal
# Velocity potential
self.fs['velPot'][i,j] = self.fs['velPot'][i,j] + \
dt*self.fs['accPot'][i,j] - \
0.5*dt*dt*grav*grad[i*ny+j][2]
# Acceleration potential
self.fs['accPot'][i,j] = self.fs['accPot'][i,j] - \
dt*grav*grad[i*ny+j][2]
# Force boundary conditions
dt*self.fs['accPot'][i,j] + \
0.5*dt*dt*grav*self.fs['pos'][i,j][2]
# Acceleration potential. This is really hard to simulate
# accurately due to numerical diffusion of the function, so
# external waves, and diffracted waves will be computed
# in two different ways:
# * External waves will be considered analitically,
# substracting waves at t, and adding waves at t+dt
# * Second order waves will be computed substracting external
# waves to free surface height, and then imposing boundary
# condition.
pos = np.copy(self.fs['pos'][i,j])
for w in waves['data']:
A = w[0]
T = w[1]
phase = w[2]
heading = np.pi*w[3]/180.0
wl = 0.5 * grav / np.pi * T*T
k = 2.0*np.pi/wl
frec = 2.0*np.pi/T
l = pos[0]*np.cos(heading) + pos[1]*np.sin(heading)
# Substract external waves height in order to know second
# order waves free surface amplitude.
amp = A*np.sin(k*l - frec*(t+dt) + phase)
pos[2] = pos[2] - amp
# Compute analitic external waves acceleration potential
amp0 = grav*A*np.cos(k*l - frec*t + phase)
amp1 = grav*A*np.cos(k*l - frec*(t+dt) + phase)
self.fs['accPot'][i,j] = self.fs['accPot'][i,j] - amp0 + amp1
# Now impose free surface boundary condition
# self.fs['accPot'][i,j] = self.fs['accPot'][i,j] + grav*pos[2]
# Impose values at beach (far free surface)
for i in range(0,nx):
for j in [0,ny-1]:
self.boundaryCondition(i,j, waves, dt, t)
self.beach(i,j, waves, dt, t)
for j in range(0,ny):
for i in [0,nx-1]:
self.boundaryCondition(i,j, waves, dt, t)
self.beach(i,j, waves, dt, t)
def evaluateGradient(self):
""" Evaluate potential gradients over free surface.
@@ -84,10 +107,15 @@ class simFSEvolution:
ny = self.fs['Ny']
nF = nx*ny
grad = np.ndarray((nF,3), dtype=np.float32)
FF = open('gradient', 'w')
for i in range(0,nx):
for j in range(0,ny):
pos = self.fs['pos'][i,j]
grad[i*ny+j] = self.gradientphi(pos)
gradVal = np.dot(np.abs(grad[i*ny+j]),grad[i*ny+j])
gradVal = np.copysign(np.sqrt(np.abs(gradVal)), gradVal)
FF.write('%g\t%g\n' % (pos[1], gradVal))
FF.close()
return grad
def gradientphi(self, pos):
@@ -112,9 +140,9 @@ class simFSEvolution:
grad[2] = 0.
return grad
def boundaryCondition(self, i,j, waves, dt, t):
""" Compute free surface at boundaries, assuming that only
incident wave can be taken into account.
def beach(self, i,j, waves, dt, t):
""" Compute far free surface where only
incident waves can be taken into account.
@param i First free surface cell index.
@param j Second free surface cell index.
@param waves Waves instance.
@@ -133,7 +161,6 @@ class simFSEvolution:
wl = 0.5 * grav / np.pi * T*T
k = 2.0*np.pi/wl
frec = 2.0*np.pi/T
pos = self.fs['pos'][i,j]
l = pos[0]*np.cos(heading) + pos[1]*np.sin(heading)
amp = A*np.sin(k*l - frec*(t+dt) + phase)
self.fs['pos'][i,j][2] = self.fs['pos'][i,j][2] + amp

BIN
src/Mod/Ship/simRun/Sim/fsEvolution.pyc Normal file
View File

Binary file not shown.

28
src/Mod/Ship/simRun/Simulation.py
View File

@@ -94,12 +94,14 @@ class FreeCADShipSimulation(threading.Thread):
FS = init.fs
waves = init.waves
dt = init.dt
t = 0.0
self.t = 0.0
self.FS = FS
nx = FS['Nx']
ny = FS['Ny']
msg = Translator.translate("\t[Sim]: Iterating...\n")
FreeCAD.Console.PrintMessage(msg)
while self.active and t < self.endTime:
count = 0
while self.active and self.t < self.endTime:
msg = Translator.translate("\t\t[Sim]: Generating linear system matrix...\n")
FreeCAD.Console.PrintMessage(msg)
matGen.execute(FS, A)
@@ -108,18 +110,16 @@ class FreeCADShipSimulation(threading.Thread):
solver.execute(FS, A)
msg = Translator.translate("\t\t[Sim]: Time integrating...\n")
FreeCAD.Console.PrintMessage(msg)
fsEvol.execute(FS, waves, dt, t)
t = t + dt
FreeCAD.Console.PrintMessage('t = %g s\n' % (t))
# Update FreeCAD
"""
pos = self.sim.FS_Position[:]
for i in range(0, nx):
for j in range(0, ny):
pos[i*ny+j].z = float(FS['pos'][i,j][2])
self.sim.FS_Position = pos[:]
FreeCAD.ActiveDocument.recompute()
"""
fsEvol.execute(FS, waves, dt, self.t)
self.t = self.t + dt
FreeCAD.Console.PrintMessage('t = %g s\n' % (self.t))
count = count+1
FF = open('%d' % (count), 'w')
i=1
for j in range(0,ny):
FF.write("%g\t%g\t%g\t%g\n" % (FS['pos'][i,j,1], FS['pos'][i,j,2],
FS['velPot'][i,j], FS['accPot'][i,j]))
FF.close()
# Set thread as stopped (and prepare it to restarting)
self.active = False
threading.Event().set()

BIN
src/Mod/Ship/simRun/Simulation.pyc Normal file
View File

Binary file not shown.