diff --git a/apps/MixMaster/DataFrame.py b/apps/MixMaster/DataFrame.py index 9a3254ad6..61e73e793 100644 --- a/apps/MixMaster/DataFrame.py +++ b/apps/MixMaster/DataFrame.py @@ -1,8 +1,8 @@ import os, math, string from Tkinter import * from Cantera import * -from Numeric import * -import Numeric +from Cantera.num import * +from Cantera import num from tkFileDialog import askopenfilename from GraphFrame import Graph from DataGraph import DataGraph, plotLimits @@ -295,7 +295,7 @@ class DataFrame(Frame): if self.ydata[n] <= 0.0: #print n, self.ydata[n] self.ydata[n] = 1.0e-20 - self.ydata = Numeric.log10(self.ydata) + self.ydata = num.log10(self.ydata) ylog = 1 self.gdata = [] diff --git a/apps/MixMaster/DataGraph.py b/apps/MixMaster/DataGraph.py index 37223263d..9293a141c 100644 --- a/apps/MixMaster/DataGraph.py +++ b/apps/MixMaster/DataGraph.py @@ -1,7 +1,7 @@ from Tkinter import * import math -from Numeric import * +from Cantera.num import * def plotLimits(ypts, f=0.0, ndiv=5, logscale=0): """Return plot limits that""" diff --git a/apps/MixMaster/Mix.py b/apps/MixMaster/Mix.py index ccaa5d8e1..ac502f22c 100644 --- a/apps/MixMaster/Mix.py +++ b/apps/MixMaster/Mix.py @@ -1,5 +1,5 @@ from Cantera import GasConstant, OneAtm -from Numeric import zeros +from Cantera.num import zeros def spdict(phase, x): nm = phase.speciesNames() diff --git a/apps/MixMaster/main.py b/apps/MixMaster/main.py index 50b714c9d..9cd99d413 100644 --- a/apps/MixMaster/main.py +++ b/apps/MixMaster/main.py @@ -13,10 +13,10 @@ _app_version = '1.0' from Tkinter import * import tkMessageBox import sys, os, string -from Numeric import zeros # Cantera imports from Cantera import * +from Cantera.num import zeros import utilities from Cantera.gases import IdealGasMix