diff --git a/Cantera/python/Cantera/ctml_writer.py b/Cantera/python/Cantera/ctml_writer.py index eab495145..36d5fadf1 100644 --- a/Cantera/python/Cantera/ctml_writer.py +++ b/Cantera/python/Cantera/ctml_writer.py @@ -798,8 +798,11 @@ class phase(writer): # are imported or defined locally. If imported, the string # contains a colon (:) for sp in self._species: - if sp.find(':') > 0: - datasrc, spnames = sp.split(':') + icolon = sp.find(':') + if icolon > 0: + #datasrc, spnames = sp.split(':') + datasrc = sp[:icolon].strip() + spnames = sp[icolon+1:] self._sp.append((datasrc+'.xml', spnames)) else: spnames = sp @@ -858,9 +861,11 @@ class phase(writer): # are imported or defined locally. If imported, the string # contains a colon (:) for r in self._rxns: - - if r.find(':') > 0: - datasrc, rnum = r.split(':') + icolon = r.find(':') + if icolon > 0: + #datasrc, rnum = r.split(':') + datasrc = r[:icolon].strip() + rnum = r[icolon+1:] self._rx.append((datasrc+'.xml', rnum)) else: rnum = r @@ -1182,7 +1187,10 @@ if __name__ == "__main__": # $Revision$ # $Date$ # $Log$ -# Revision 1.19 2003-08-26 03:39:02 dggoodwin +# Revision 1.20 2003-09-22 13:14:34 dggoodwin +# *** empty log message *** +# +# Revision 1.19 2003/08/26 03:39:02 dggoodwin # *** empty log message *** # # Revision 1.18 2003/08/21 14:29:53 dggoodwin diff --git a/Cantera/src/oneD/Sim1D.cpp b/Cantera/src/oneD/Sim1D.cpp index 25a7c46ef..676e3cb27 100644 --- a/Cantera/src/oneD/Sim1D.cpp +++ b/Cantera/src/oneD/Sim1D.cpp @@ -256,6 +256,7 @@ namespace Cantera { catch (CanteraError) { + popError(); char buf[100]; if (loglevel > 0) { writelog(" failure. \n\n");