From 2f9f2abf5efab61f7f80e9c53beb3de2b216403c Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Wed, 30 May 2012 16:02:48 +0000
Subject: [PATCH] Fixed setting the _initialized flag on restored Python OneD
 objects

---
 interfaces/python/Cantera/OneD/BurnerDiffFlame.py | 1 -
 interfaces/python/Cantera/OneD/BurnerFlame.py     | 1 -
 interfaces/python/Cantera/OneD/CounterFlame.py    | 1 -
 interfaces/python/Cantera/OneD/FreeFlame.py       | 1 -
 interfaces/python/Cantera/OneD/StagnationFlow.py  | 2 +-
 interfaces/python/Cantera/OneD/onedim.py          | 2 ++
 6 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/interfaces/python/Cantera/OneD/BurnerDiffFlame.py b/interfaces/python/Cantera/OneD/BurnerDiffFlame.py
index 3f2a1d2d4..4418a3a22 100644
--- a/interfaces/python/Cantera/OneD/BurnerDiffFlame.py
+++ b/interfaces/python/Cantera/OneD/BurnerDiffFlame.py
@@ -38,7 +38,6 @@ class BurnerDiffFlame(Stack):
         self.flame.setupGrid(grid)
         Stack.__init__(self, [self.burner, self.flame, self.outlet])
         self.setRefineCriteria()
-        self._initialized = 0
 
 
     def init(self):
diff --git a/interfaces/python/Cantera/OneD/BurnerFlame.py b/interfaces/python/Cantera/OneD/BurnerFlame.py
index 5f3843cea..3be575bcc 100644
--- a/interfaces/python/Cantera/OneD/BurnerFlame.py
+++ b/interfaces/python/Cantera/OneD/BurnerFlame.py
@@ -38,7 +38,6 @@ class BurnerFlame(Stack):
         self.flame.setupGrid(grid)
         Stack.__init__(self, [self.burner, self.flame, self.outlet])
         self.setRefineCriteria()
-        self._initialized = 0
 
 
     def init(self):
diff --git a/interfaces/python/Cantera/OneD/CounterFlame.py b/interfaces/python/Cantera/OneD/CounterFlame.py
index b6431708e..4c9d328f7 100644
--- a/interfaces/python/Cantera/OneD/CounterFlame.py
+++ b/interfaces/python/Cantera/OneD/CounterFlame.py
@@ -52,7 +52,6 @@ class CounterFlame(Stack):
         Stack.__init__(self, [self.fuel_inlet, self.flame,
                               self.oxidizer_inlet])
         self.setRefineCriteria()
-        self._initialized = 0
 
 
     def init(self, fuel = '', oxidizer = 'O2', stoich = -1.0):
diff --git a/interfaces/python/Cantera/OneD/FreeFlame.py b/interfaces/python/Cantera/OneD/FreeFlame.py
index daeedb18c..238311fb4 100644
--- a/interfaces/python/Cantera/OneD/FreeFlame.py
+++ b/interfaces/python/Cantera/OneD/FreeFlame.py
@@ -31,7 +31,6 @@ class FreeFlame(Stack):
         self.flame.setupGrid(grid)
         Stack.__init__(self, [self.inlet, self.flame, self.outlet])
         self.setRefineCriteria()
-        self._initialized = 0
         self.tfix = tfix
 
 
diff --git a/interfaces/python/Cantera/OneD/StagnationFlow.py b/interfaces/python/Cantera/OneD/StagnationFlow.py
index 6032e37cc..96f3158fa 100644
--- a/interfaces/python/Cantera/OneD/StagnationFlow.py
+++ b/interfaces/python/Cantera/OneD/StagnationFlow.py
@@ -31,7 +31,7 @@ class StagnationFlow(Stack):
         self.flow.setupGrid(grid)
         Stack.__init__(self, [self.inlet, self.flow, self.surface])
         self.setRefineCriteria()
-        self._initialized = 0
+
 
     def init(self, products = 'inlet'):
         """Set the initial guess for the solution. If products = 'equil',
diff --git a/interfaces/python/Cantera/OneD/onedim.py b/interfaces/python/Cantera/OneD/onedim.py
index ed888c5d5..155f4b31b 100644
--- a/interfaces/python/Cantera/OneD/onedim.py
+++ b/interfaces/python/Cantera/OneD/onedim.py
@@ -477,6 +477,7 @@ class Stack:
             hndls[n] = domains[n].domain_hndl()
         self._hndl = _cantera.sim1D_new(hndls)
         self._domains = domains
+        self._initialized = False
 
     def __del__(self):
         _cantera.sim1D_del(self._hndl)
@@ -633,6 +634,7 @@ class Stack:
 
         >>> s.restore(file = 'save.xml', id = 'energy_off')
         """
+        self._initialized = True
         return _cantera.sim1D_restore(self._hndl, file, id)
 
     def showStats(self, printTime = 1):