|
|
|
@ -42,7 +42,7 @@ H=open("HARMONIC","r")
|
|
|
|
|
l=readlinenocomm(H)
|
|
|
|
|
numconstits=int(l)
|
|
|
|
|
|
|
|
|
|
print "Number of Constituents = ",numconstits
|
|
|
|
|
print("Number of Constituents = ",numconstits)
|
|
|
|
|
|
|
|
|
|
# Read in the constituent speeds
|
|
|
|
|
|
|
|
|
@ -79,8 +79,8 @@ while i<numconstits:
|
|
|
|
|
i=i+1
|
|
|
|
|
|
|
|
|
|
l=readlinenocomm(H)
|
|
|
|
|
if l[0:5]<>'*END*':
|
|
|
|
|
print "Error, expected end after eq args. Got: ",l
|
|
|
|
|
if l[0:5]!='*END*':
|
|
|
|
|
print("Error, expected end after eq args. Got: ",l)
|
|
|
|
|
|
|
|
|
|
# Read in the node factors
|
|
|
|
|
|
|
|
|
@ -105,8 +105,8 @@ while i<numconstits:
|
|
|
|
|
i=i+1
|
|
|
|
|
|
|
|
|
|
l=readlinenocomm(H)
|
|
|
|
|
if l[0:5]<>'*END*':
|
|
|
|
|
print "Error, expected end after node factors. Got: ",l
|
|
|
|
|
if l[0:5]!='*END*':
|
|
|
|
|
print("Error, expected end after node factors. Got: ",l)
|
|
|
|
|
|
|
|
|
|
harm['sa']=[0.0410686,0.04,44.3373]
|
|
|
|
|
harm['ssa']=[0.0821373,0.0233,140.8642]
|
|
|
|
@ -225,8 +225,8 @@ MSL=0.9952
|
|
|
|
|
|
|
|
|
|
# Now do the maths
|
|
|
|
|
|
|
|
|
|
start_time=datetime.datetime(2016,07,29,0,0,0)
|
|
|
|
|
end_time=datetime.datetime(2016,07,30,0,0,0)
|
|
|
|
|
start_time=datetime.datetime(2016,7,29,0,0,0)
|
|
|
|
|
end_time=datetime.datetime(2016,7,30,0,0,0)
|
|
|
|
|
|
|
|
|
|
time_step=datetime.timedelta(minutes=15)
|
|
|
|
|
|
|
|
|
@ -259,6 +259,3 @@ plt.figure()
|
|
|
|
|
plot(x,y,c='g',label='Sample')
|
|
|
|
|
plt.gcf().autofmt_xdate()
|
|
|
|
|
show()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|