Commit e0a34fdd authored by Yan Zhaojun's avatar Yan Zhaojun
Browse files

test

parent 1d65c58c
Pipeline #4627 failed with stage
in 0 seconds
...@@ -1934,7 +1934,7 @@ class IFSsimulator(): ...@@ -1934,7 +1934,7 @@ class IFSsimulator():
############################################################################### ###############################################################################
############################################################################### ###############################################################################
def configure(self, simnumber,dir_path, result_path): def configure(self, sourcein, dir_path, result_path, simnumber, debug, applyhole):
""" """
...@@ -1972,7 +1972,7 @@ class IFSsimulator(): ...@@ -1972,7 +1972,7 @@ class IFSsimulator():
# self.information['holemask'] # self.information['holemask']
if self.source == 'LAMP': if self.source == 'LAMP':
if self.information['holemask'] == 'yes': if applyhole == 'yes':
ss = '_with_hole_' ss = '_with_hole_'
else: else:
ss = '_no_hole_' ss = '_no_hole_'
...@@ -5461,7 +5461,8 @@ class IFSsimulator(): ...@@ -5461,7 +5461,8 @@ class IFSsimulator():
self.source = sourcein self.source = sourcein
self.simnumber = simnumber self.simnumber = simnumber
self.configure(simnumber,dir_path,result_path) # print the configfile name and path;
#self.configure(simnumber,dir_path,result_path) # print the configfile name and path;
self.debug = self.information['debug'] self.debug = self.information['debug']
...@@ -5756,6 +5757,9 @@ def runIFSsim(sourcein, configfile, dir_path, result_path, iLoop, debug, applyho ...@@ -5756,6 +5757,9 @@ def runIFSsim(sourcein, configfile, dir_path, result_path, iLoop, debug, applyho
simulate = dict() simulate = dict()
simulate[iLoop] = IFSsimulator(configfile) simulate[iLoop] = IFSsimulator(configfile)
simulate[iLoop].configure(sourcein, dir_path, result_path, iLoop, debug, applyhole) # load the configfile;
if applyhole == 'yes' and sourcein == 'LAMP': if applyhole == 'yes' and sourcein == 'LAMP':
simulate[iLoop].information['holemask'] = 'yes' simulate[iLoop].information['holemask'] = 'yes'
else: else:
......
Supports Markdown
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