Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changed relative import to absolute import #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changed relative import to absolute import #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion interfaces/cython/cantera/mixmaster/CompositionFrame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from cantera import *
import numpy as np

from .SpeciesInfo import SpeciesInfo
from SpeciesInfo import SpeciesInfo
#from KineticsFrame import KineticsFrame

_CUTOFF = 1.e-15
Expand Down
6 changes: 3 additions & 3 deletions interfaces/cython/cantera/mixmaster/DataFrame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

from cantera import *
import numpy as np
from .GraphFrame import Graph
from .DataGraph import DataGraph, plotLimits
from .ControlPanel import make_menu
from GraphFrame import Graph
from DataGraph import DataGraph, plotLimits
from ControlPanel import make_menu


U_LOC = 1
Expand Down
8 changes: 4 additions & 4 deletions interfaces/cython/cantera/mixmaster/Edit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
else:
from Tkinter import *

from .ElementFrame import getElements
from .utilities import handleError
from ElementFrame import getElements
from utilities import handleError
from cantera import *
from .config import *
from .SpeciesFrame import getSpecies
from config import *
from SpeciesFrame import getSpecies

def testit():
pass
Expand Down
2 changes: 1 addition & 1 deletion interfaces/cython/cantera/mixmaster/KineticsFrame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from cantera import *

from .SpeciesInfo import SpeciesInfo
from SpeciesInfo import SpeciesInfo
import webbrowser

_CUTOFF = 1.e-15
Expand Down
4 changes: 2 additions & 2 deletions interfaces/cython/cantera/mixmaster/MechManager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
else:
from Tkinter import *

from .ControlPanel import ControlWindow
from .ControlPanel import make_menu, menuitem_state, add_menu_item
from ControlPanel import ControlWindow
from ControlPanel import make_menu, menuitem_state, add_menu_item
#from Cantera.Examples.Tk import _mechdir
import os

Expand Down
2 changes: 1 addition & 1 deletion interfaces/cython/cantera/mixmaster/Mix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from cantera import gas_constant
from numpy import zeros, ones
from .utilities import handleError
from utilities import handleError

def spdict(phase, x):
nm = phase.speciesNames()
Expand Down
2 changes: 1 addition & 1 deletion interfaces/cython/cantera/mixmaster/NewFlowFrame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
else:
from Tkinter import *

from .SpeciesInfo import SpeciesInfo
from SpeciesInfo import SpeciesInfo

_CUTOFF = 1.e-15
_ATOL = 1.e-15
Expand Down
6 changes: 3 additions & 3 deletions interfaces/cython/cantera/mixmaster/SpeciesInfo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

import re, math
from cantera import *
from .Units import temperature, specificEnergy, specificEntropy
from .UnitChooser import UnitVar
from .GraphFrame import Graph
from Units import temperature, specificEnergy, specificEntropy
from UnitChooser import UnitVar
from GraphFrame import Graph

def testit():
pass
Expand Down
8 changes: 4 additions & 4 deletions interfaces/cython/cantera/mixmaster/ThermoFrame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
else:
from Tkinter import *

from .Units import temperature, pressure, density, specificEnergy, specificEntropy
from .UnitChooser import UnitVar
from .ThermoProp import ThermoProp
from .utilities import handleError
from Units import temperature, pressure, density, specificEnergy, specificEntropy
from UnitChooser import UnitVar
from ThermoProp import ThermoProp
from utilities import handleError

_PRESSURE = 1
_TEMPERATURE = 0
Expand Down
2 changes: 1 addition & 1 deletion interfaces/cython/cantera/mixmaster/ThermoProp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
else:
from Tkinter import *

from .UnitChooser import UnitVar
from UnitChooser import UnitVar

_tv = ['Temperature','Internal Energy','Enthalpy']
_pv = ['Pressure', 'Density']
Expand Down
2 changes: 1 addition & 1 deletion interfaces/cython/cantera/mixmaster/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

from .cantera import *
from cantera import *

# thermo parametrizations
#from Cantera.Species.Thermo.NasaPolynomial import NasaPolynomial
24 changes: 12 additions & 12 deletions interfaces/cython/cantera/mixmaster/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@
# Cantera imports
from cantera import *
from numpy import zeros
from . import utilities
import utilities

# local imports
from .TransportFrame import TransportFrame
from .CompositionFrame import MixtureFrame
from .ThermoFrame import ThermoFrame
from .ImportFrame import ImportFrame
from .DataFrame import DataFrame
from .KineticsFrame import SpeciesKineticsFrame, ReactionKineticsFrame, ReactionPathFrame
from TransportFrame import TransportFrame
from CompositionFrame import MixtureFrame
from ThermoFrame import ThermoFrame
from ImportFrame import ImportFrame
from DataFrame import DataFrame
from KineticsFrame import SpeciesKineticsFrame, ReactionKineticsFrame, ReactionPathFrame
#from Edit import EditFrame
from .MechManager import MechManager, _autoload
from .UnitChooser import UnitVar
from .ControlPanel import ControlWindow
from .ControlPanel import make_menu, menuitem_state
from .Mix import Mix, Species
from MechManager import MechManager, _autoload
from UnitChooser import UnitVar
from ControlPanel import ControlWindow
from ControlPanel import make_menu, menuitem_state
from Mix import Mix, Species

def testit():
return
Expand Down