merge correction
This commit is contained in:
parent
ec42e1bd15
commit
f58c5a5f9d
@ -325,13 +325,9 @@ def vgrids2VTK(inputfile='vgrids.in', outputfile='vgrids.vtk', absOrRel='abs', i
|
|||||||
|
|
||||||
outfile.writelines('POINT_DATA %15d\n' % (nPoints))
|
outfile.writelines('POINT_DATA %15d\n' % (nPoints))
|
||||||
if absOrRel == 'abs':
|
if absOrRel == 'abs':
|
||||||
<<<<<<< HEAD
|
|
||||||
outfile.writelines('SCALARS velocity float %d\n' %(1))
|
outfile.writelines('SCALARS velocity float %d\n' %(1))
|
||||||
if absOrRel == 'relDepth':
|
if absOrRel == 'relDepth':
|
||||||
outfile.writelines('SCALARS velocity2depthMean float %d\n' %(1))
|
outfile.writelines('SCALARS velocity2depthMean float %d\n' %(1))
|
||||||
=======
|
|
||||||
outfile.writelines('SCALARS velocity float %d\n' % (1))
|
|
||||||
>>>>>>> 37f9292c39246b327d3630995ca2521725c6cdd7
|
|
||||||
elif absOrRel == 'rel':
|
elif absOrRel == 'rel':
|
||||||
outfile.writelines('SCALARS velChangePercent float %d\n' % (1))
|
outfile.writelines('SCALARS velChangePercent float %d\n' % (1))
|
||||||
outfile.writelines('LOOKUP_TABLE default\n')
|
outfile.writelines('LOOKUP_TABLE default\n')
|
||||||
@ -342,7 +338,6 @@ def vgrids2VTK(inputfile='vgrids.in', outputfile='vgrids.vtk', absOrRel='abs', i
|
|||||||
if absOrRel == 'abs':
|
if absOrRel == 'abs':
|
||||||
print("Writing velocity values to VTK file...")
|
print("Writing velocity values to VTK file...")
|
||||||
for velocity in vel:
|
for velocity in vel:
|
||||||
<<<<<<< HEAD
|
|
||||||
outfile.writelines('%10f\n' %velocity)
|
outfile.writelines('%10f\n' %velocity)
|
||||||
elif absOrRel == 'relDepth':
|
elif absOrRel == 'relDepth':
|
||||||
print("Writing velocity values to VTK file relative to mean of each depth...")
|
print("Writing velocity values to VTK file relative to mean of each depth...")
|
||||||
@ -357,9 +352,6 @@ def vgrids2VTK(inputfile='vgrids.in', outputfile='vgrids.vtk', absOrRel='abs', i
|
|||||||
for vel in veldepth:
|
for vel in veldepth:
|
||||||
outfile.writelines('%10f\n' %(vel - velmean))
|
outfile.writelines('%10f\n' %(vel - velmean))
|
||||||
veldepth = []
|
veldepth = []
|
||||||
=======
|
|
||||||
outfile.writelines('%10f\n' % velocity)
|
|
||||||
>>>>>>> 37f9292c39246b327d3630995ca2521725c6cdd7
|
|
||||||
elif absOrRel == 'rel':
|
elif absOrRel == 'rel':
|
||||||
nref, dref, sref, velref = _readVgrid(inputfileref)
|
nref, dref, sref, velref = _readVgrid(inputfileref)
|
||||||
nR_ref, nTheta_ref, nPhi_ref = nref
|
nR_ref, nTheta_ref, nPhi_ref = nref
|
||||||
|
Loading…
Reference in New Issue
Block a user