/[ascend]/trunk/pygtk/ascpy.i
ViewVC logotype

Diff of /trunk/pygtk/ascpy.i

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 965 by johnpye, Tue Nov 28 23:01:50 2006 UTC revision 966 by johnpye, Thu Dec 14 14:04:54 2006 UTC
# Line 33  Line 33 
33  #include "solverreporter.h"  #include "solverreporter.h"
34  #include "incidencematrix.h"  #include "incidencematrix.h"
35  #include "registry.h"  #include "registry.h"
 #include <compiler/importhandler.h>  
36  #include "annotation.h"  #include "annotation.h"
37    
38    extern "C"{
39    #include <compiler/importhandler.h>
40    #include <utilities/ascMalloc.h>
41    }
42    
43  #ifdef ASC_WITH_DMALLOC  #ifdef ASC_WITH_DMALLOC
44  # include <dmalloc.h>  # include <dmalloc.h>
45  #endif  #endif
# Line 181  public: Line 185  public:
185      const short getFractionDenominator(const unsigned &) const;      const short getFractionDenominator(const unsigned &) const;
186  };  };
187    
188  class UnitsM{  %include "units.h"
 public:  
     UnitsM(const char *);  
     const SymChar getName() const; // the units description string eg 'bar' or 'kJ/kg/K'  
     const Dimensions getDimensions() const;  
     const double getConversion() const; // multiplication factor to convert eg feet to SI (metres)  
 };  
189    
190  %extend UnitsM{  %extend UnitsM{
191      %pythoncode{      %pythoncode{
# Line 492  public: Line 490  public:
490      }      }
491  }  }
492    
493    void shutdown();
494    
495    %{
496    void shutdown(){
497        ascshutdown("Shutdown ASCEND...");
498    }
499    %}
500    
501  %include "solver.i"  %include "solver.i"
502    
503  %include "extmethod.h"  %include "extmethod.h"

Legend:
Removed from v.965  
changed lines
  Added in v.966

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22