test (355e76b6) · Commits · csst-sims / csst_ifs_sim

csst_ifs_sim/csst_ifs_sim.py

+9 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1934,7 +1934,7 @@ class IFSsimulator():

	###############################################################################		###############################################################################
	###############################################################################		###############################################################################
	def configure(self, simnumber):		def configure(self, simnumber,dir_path, result_path):
	"""		"""


	@@ -1959,6 +1959,10 @@ class IFSsimulator():

	self._createEmpty()		self._createEmpty()

			self.information['dir_path']=dir_path

			self.information['result_path']=result_path

	############################################################		############################################################

	now = datetime.utcnow()		now = datetime.utcnow()
	@@ -1992,6 +1996,7 @@ class IFSsimulator():


	self.result_path= self.information['result_path']+'/'+self.source+ss+result_day		self.result_path= self.information['result_path']+'/'+self.source+ss+result_day
			print(self.information['result_path'])

	if os.path.isdir(self.result_path) == False:		if os.path.isdir(self.result_path) == False:
	os.mkdir(self.result_path)		os.mkdir(self.result_path)
	@@ -5456,7 +5461,7 @@ class IFSsimulator():
	self.source = sourcein		self.source = sourcein

	self.simnumber = simnumber		self.simnumber = simnumber
	self.configure(simnumber) # 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']

	@@ -5763,8 +5768,6 @@ def runIFSsim(sourcein, configfile, dir_path, result_path,iLoop, debug, applyhol

	simulate[iLoop].information['result_path'] = result_path		simulate[iLoop].information['result_path'] = result_path



	simulate[iLoop].simulate(sourcein, iLoop)		simulate[iLoop].simulate(sourcein, iLoop)

	return 1		return 1

tests/test_ifs_sim.py

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -155,9 +155,11 @@ class TestDemoFunction(unittest.TestCase):
	print(configfile)		print(configfile)

	debug=True		debug=True

	result_path=dir_path+'ifs_sim_result'		result_path=dir_path+'ifs_sim_result'

	csst_ifs_sim.runIFSsim(sourcein, configfile, dir_path, result_path, 1, debug,'no')		csst_ifs_sim.runIFSsim(sourcein, configfile, dir_path, result_path, 1, debug,'no')

	self.assertEqual(		self.assertEqual(
	1 , 1,		1 , 1,
	"case 4: sim passes.",		"case 4: sim passes.",
	@@ -227,6 +229,7 @@ class TestDemoFunction(unittest.TestCase):
	print(configfile)		print(configfile)

	debug=True		debug=True

	result_path=dir_path+'ifs_sim_result'		result_path=dir_path+'ifs_sim_result'

	csst_ifs_sim.runIFSsim(sourcein, configfile, dir_path, result_path, 1, debug,'no')		csst_ifs_sim.runIFSsim(sourcein, configfile, dir_path, result_path, 1, debug,'no')