Skip to content
Snippets Groups Projects
Commit 0dab8bce authored by Frederik Zahle's avatar Frederik Zahle
Browse files

Merge branch 'abl_les_output' into 'master'

ABL LES output

See merge request !10
parents 007ddb74 d5187887
No related branches found
No related tags found
1 merge request!10ABL LES output
Pipeline #
...@@ -431,8 +431,8 @@ class EllipSys3DOutput(object): ...@@ -431,8 +431,8 @@ class EllipSys3DOutput(object):
setattr(self, 'ext_%s_%iCF%03d' % (xdir, grlev, i), data[ix, 5]) setattr(self, 'ext_%s_%iCF%03d' % (xdir, grlev, i), data[ix, 5])
setattr(self, 'ext_%s_%iP_ave%03d' % (xdir, grlev, i), data[ix, 6]) setattr(self, 'ext_%s_%iP_ave%03d' % (xdir, grlev, i), data[ix, 6])
setattr(self, 'ext_%s_%iCF_ave%03d' % (xdir, grlev, i), data[ix, 7]) setattr(self, 'ext_%s_%iCF_ave%03d' % (xdir, grlev, i), data[ix, 7])
# read the grid.points file # read the grid.*points file
var_map = {} var_map = {}
for grlev in range(1, 6): for grlev in range(1, 6):
filename = self.project + '.%ipoints' % grlev filename = self.project + '.%ipoints' % grlev
...@@ -457,3 +457,56 @@ class EllipSys3DOutput(object): ...@@ -457,3 +457,56 @@ class EllipSys3DOutput(object):
for j in range(data.shape[1]): for j in range(data.shape[1]):
var = getattr(self, 'pt_ext_%s' % var_map[j]) var = getattr(self, 'pt_ext_%s' % var_map[j])
var.append(data[:, j]) var.append(data[:, j])
# read the grid.*les file
var_map = {}
for grlev in range(1, 6):
filename = self.project + '.%iles' % grlev
if not os.path.exists(filename):
break
fid = open(filename, 'r')
fid.readline()
fid.readline()
fid.readline()
line = fid.readline()
ivar = 0
while line.startswith('#'):
name = line.split()[-1]
var_map[ivar] = name
if not hasattr(self, 'les_ext_%s' % name):
setattr(self, 'les_ext_%s' % name, [])
line = fid.readline()
ivar += 1
# unroll readline so all data is read by loadtxt
fid.seek(-len(line), 1)
data = np.loadtxt(fid)
for j in range(data.shape[1]):
var = getattr(self, 'les_ext_%s' % var_map[j])
var.append(data[:, j])
# read the grid.*ha file
var_map = {}
for grlev in range(1, 6):
filename = self.project + '.%iha' % grlev
if not os.path.exists(filename):
break
fid = open(filename, 'r')
fid.readline()
fid.readline()
fid.readline()
line = fid.readline()
ivar = 0
while line.startswith('#'):
name = line.split()[-1]
var_map[ivar] = name
if not hasattr(self, 'ha_ext_%s' % name):
setattr(self, 'ha_ext_%s' % name, [])
line = fid.readline()
ivar += 1
# unroll readline so all data is read by loadtxt
fid.seek(-len(line), 1)
data = np.loadtxt(fid)
for j in range(data.shape[1]):
var = getattr(self, 'ha_ext_%s' % var_map[j])
var.append(data[:, j])
...@@ -103,7 +103,9 @@ class CaseRunner(object): ...@@ -103,7 +103,9 @@ class CaseRunner(object):
'grid.%ipoints', 'grid.%ipoints',
'grid.%iHY', 'grid.%iHY',
'grid.%iFY', 'grid.%iFY',
'grid.%iPY'] 'grid.%iPY',
'grid.%iles',
'grid.%iha']
for i in range(1, 0, -1): for i in range(1, 0, -1):
for f in files: for f in files:
try: try:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment