From 3764641ff902e3e7414756ede37962d079e36042 Mon Sep 17 00:00:00 2001
From: plaa <plaa@dtu.dk>
Date: Fri, 7 Jul 2017 15:43:55 +0200
Subject: [PATCH] Added grid level to grid.les file
---
ellipsyswrapper/ellipsys_output.py | 9 ++++++---
ellipsyswrapper/testsuite.py | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ellipsyswrapper/ellipsys_output.py b/ellipsyswrapper/ellipsys_output.py
index 9946786..7d21151 100644
--- a/ellipsyswrapper/ellipsys_output.py
+++ b/ellipsyswrapper/ellipsys_output.py
@@ -457,10 +457,13 @@ class EllipSys3DOutput(object):
for j in range(data.shape[1]):
var = getattr(self, 'pt_ext_%s' % var_map[j])
var.append(data[:, j])
-
+
# read the grid.les file
- filename = self.project + '.les'
- if os.path.exists(filename):
+ 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()
diff --git a/ellipsyswrapper/testsuite.py b/ellipsyswrapper/testsuite.py
index ab965f9..4f42eee 100644
--- a/ellipsyswrapper/testsuite.py
+++ b/ellipsyswrapper/testsuite.py
@@ -104,7 +104,7 @@ class CaseRunner(object):
'grid.%iHY',
'grid.%iFY',
'grid.%iPY',
- 'grid.les']
+ 'grid.%iles']
for i in range(1, 0, -1):
for f in files:
try:
--
GitLab