Commit 86639ea6 authored by Tjerk Vreeken's avatar Tjerk Vreeken

Python 2to3 fixes: unicode

parent 5ac24ffe
...@@ -57,9 +57,9 @@ source_suffix = '.rst' ...@@ -57,9 +57,9 @@ source_suffix = '.rst'
master_doc = 'index' master_doc = 'index'
# General information about the project. # General information about the project.
project = u'RTC-Tools' project = 'RTC-Tools'
copyright = u'2016 Deltares' copyright = '2016 Deltares'
author = u'Jorn Baayen, Matthijs den Toom, et al.' author = 'Jorn Baayen, Matthijs den Toom, et al.'
# The version info for the project you're documenting, acts as replacement for # The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the # |version| and |release|, also used in various other places throughout the
...@@ -268,8 +268,8 @@ latex_elements = { ...@@ -268,8 +268,8 @@ latex_elements = {
# (source start file, target name, title, # (source start file, target name, title,
# author, documentclass [howto, manual, or own class]). # author, documentclass [howto, manual, or own class]).
latex_documents = [ latex_documents = [
(master_doc, 'RTC-Tools.tex', u'RTC-Tools Documentation', (master_doc, 'RTC-Tools.tex', 'RTC-Tools Documentation',
u'Jorn Baayen, Matthijs den Toom, et al.', 'manual'), 'Jorn Baayen, Matthijs den Toom, et al.', 'manual'),
] ]
# The name of an image file (relative to this directory) to place at the top of # The name of an image file (relative to this directory) to place at the top of
...@@ -310,7 +310,7 @@ latex_documents = [ ...@@ -310,7 +310,7 @@ latex_documents = [
# One entry per manual page. List of tuples # One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section). # (source start file, name, description, authors, manual section).
man_pages = [ man_pages = [
(master_doc, 'rtc-tools', u'RTC-Tools Documentation', (master_doc, 'rtc-tools', 'RTC-Tools Documentation',
[author], 1) [author], 1)
] ]
...@@ -325,7 +325,7 @@ man_pages = [ ...@@ -325,7 +325,7 @@ man_pages = [
# (source start file, target name, title, author, # (source start file, target name, title, author,
# dir menu entry, description, category) # dir menu entry, description, category)
texinfo_documents = [ texinfo_documents = [
(master_doc, 'RTC-Tools', u'RTC-Tools Documentation', (master_doc, 'RTC-Tools', 'RTC-Tools Documentation',
author, 'RTC-Tools', 'One line description of project.', author, 'RTC-Tools', 'One line description of project.',
'Miscellaneous'), 'Miscellaneous'),
] ]
......
...@@ -20,7 +20,7 @@ axarr[0].set_title('Water Volume and Discharge') ...@@ -20,7 +20,7 @@ axarr[0].set_title('Water Volume and Discharge')
f.autofmt_xdate() f.autofmt_xdate()
# Upper subplot # Upper subplot
axarr[0].set_ylabel(u'Water Volume [m\u00B3]') axarr[0].set_ylabel('Water Volume [m\u00B3]')
axarr[0].ticklabel_format(style='sci', axis='y', scilimits=(0,0)) axarr[0].ticklabel_format(style='sci', axis='y', scilimits=(0,0))
axarr[0].plot(results['time'], results['V_storage'], label='Storage', axarr[0].plot(results['time'], results['V_storage'], label='Storage',
linewidth=2, color='b') linewidth=2, color='b')
...@@ -30,7 +30,7 @@ axarr[0].plot(results['time'], [380000]*len(results['time']), label='Storage Min ...@@ -30,7 +30,7 @@ axarr[0].plot(results['time'], [380000]*len(results['time']), label='Storage Min
linewidth=2, color='g', linestyle='--') linewidth=2, color='g', linestyle='--')
# Lower Subplot # Lower Subplot
axarr[1].set_ylabel(u'Flow Rate [m\u00B3/s]') axarr[1].set_ylabel('Flow Rate [m\u00B3/s]')
# axarr[1].plot(results['time'], results['Q_in'], label='Inflow', # axarr[1].plot(results['time'], results['Q_in'], label='Inflow',
# linewidth=2, color='g') # linewidth=2, color='g')
axarr[1].plot(results['time'], results['Q_release'], label='Release', axarr[1].plot(results['time'], results['Q_release'], label='Release',
......
...@@ -25,11 +25,11 @@ shades = [0.5, 0.8] ...@@ -25,11 +25,11 @@ shades = [0.5, 0.8]
f.autofmt_xdate() f.autofmt_xdate()
# Upper Subplot # Upper Subplot
axarr[0].set_ylabel(u'Water Volume in Storage [m\u00B3]') axarr[0].set_ylabel('Water Volume in Storage [m\u00B3]')
axarr[0].ticklabel_format(style='sci', axis='y', scilimits=(0,0)) axarr[0].ticklabel_format(style='sci', axis='y', scilimits=(0,0))
# Lower Subplot # Lower Subplot
axarr[1].set_ylabel(u'Flow Rate [m\u00B3/s]') axarr[1].set_ylabel('Flow Rate [m\u00B3/s]')
# Plot Ensemble Members # Plot Ensemble Members
for idx, forecast in enumerate(forecast_names): for idx, forecast in enumerate(forecast_names):
......
...@@ -35,7 +35,7 @@ axarr[1].plot(results['time'], 0.43 * np.ones_like(results['time']), label='Stor ...@@ -35,7 +35,7 @@ axarr[1].plot(results['time'], 0.43 * np.ones_like(results['time']), label='Stor
linewidth=2, color='g', linestyle='--') linewidth=2, color='g', linestyle='--')
# Lower Subplot # Lower Subplot
axarr[2].set_ylabel(u'Flow Rate [m\u00B3/s]') axarr[2].set_ylabel('Flow Rate [m\u00B3/s]')
axarr[2].plot(results['time'], results['Q_orifice'], label='Orifice', axarr[2].plot(results['time'], results['Q_orifice'], label='Orifice',
linewidth=2, color='g') linewidth=2, color='g')
axarr[2].plot(results['time'], results['Q_pump'], label='Pump', axarr[2].plot(results['time'], results['Q_pump'], label='Pump',
......
...@@ -20,7 +20,7 @@ axarr[0].set_title('Water Volume and Discharge') ...@@ -20,7 +20,7 @@ axarr[0].set_title('Water Volume and Discharge')
f.autofmt_xdate() f.autofmt_xdate()
# Upper subplot # Upper subplot
axarr[0].set_ylabel(u'Water Volume [m\u00B3]') axarr[0].set_ylabel('Water Volume [m\u00B3]')
axarr[0].ticklabel_format(style='sci', axis='y', scilimits=(0,0)) axarr[0].ticklabel_format(style='sci', axis='y', scilimits=(0,0))
axarr[0].plot(results['time'], results['storage_V'], label='Storage', axarr[0].plot(results['time'], results['storage_V'], label='Storage',
linewidth=2, color='b') linewidth=2, color='b')
...@@ -30,7 +30,7 @@ axarr[0].plot(results['time'], results['V_min'], label='Storage Min', ...@@ -30,7 +30,7 @@ axarr[0].plot(results['time'], results['V_min'], label='Storage Min',
linewidth=2, color='g', linestyle='--') linewidth=2, color='g', linestyle='--')
# Lower Subplot # Lower Subplot
axarr[1].set_ylabel(u'Flow Rate [m\u00B3/s]') axarr[1].set_ylabel('Flow Rate [m\u00B3/s]')
axarr[1].plot(results['time'], results['Q_in'], label='Inflow', axarr[1].plot(results['time'], results['Q_in'], label='Inflow',
linewidth=2, color='g') linewidth=2, color='g')
axarr[1].plot(results['time'], results['Q_release'], label='Release', axarr[1].plot(results['time'], results['Q_release'], label='Release',
......
...@@ -27,7 +27,7 @@ axarr[0].plot(results['time'], 0.5 * np.ones_like(results['time']), label='Stora ...@@ -27,7 +27,7 @@ axarr[0].plot(results['time'], 0.5 * np.ones_like(results['time']), label='Stora
linewidth=2, color='r', linestyle='--') linewidth=2, color='r', linestyle='--')
# Lower Subplot # Lower Subplot
axarr[1].set_ylabel(u'Flow Rate [m\u00B3/s]') axarr[1].set_ylabel('Flow Rate [m\u00B3/s]')
axarr[1].plot(results['time'], results['Q_orifice'], label='Orifice', axarr[1].plot(results['time'], results['Q_orifice'], label='Orifice',
linewidth=2, color='g') linewidth=2, color='g')
axarr[1].plot(results['time'], results['Q_pump'], label='Pump', axarr[1].plot(results['time'], results['Q_pump'], label='Pump',
......
Markdown is supported
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