Index: /branches/c13_branch/source/mole.h =================================================================== --- /branches/c13_branch/source/mole.h (revision 6864) +++ /branches/c13_branch/source/mole.h (revision 11053) @@ -324,4 +324,47 @@ extern t_mole_global mole_global; +class molezone { +public: + molezone() + { + init(); + } + void init (void) + { + location = NULL; + levels = NULL; + lines = NULL; + zero(); + } + void zero (void) + { + src = 0.; + snk = 0.; + den = 0.; + column = 0.; + nAtomLim = -1; + xFracLim = 0.; + column_old = 0.; + } + double *location; /** Location of density in non-molecule code, NULL if none exists */ + + /** rate s-1 for molecular charge transfer, nelem from to */ + double src, snk; + + qList* levels; + TransitionList* lines; + + /* Current zone data */ + double den; /** density (cm-3) */ + realnum column; /** total column density in this iteration */ + int nAtomLim; /** atomic number MINUS ONE of element for which is closest to limiting molecule density */ + realnum xFracLim; /** The fraction of that element in this species */ + + /* Historical solution data */ + realnum column_old; /** total column density in previous iteration */ +}; + +extern molezone *null_molezone; + class t_mole_local { @@ -362,47 +405,4 @@ extern t_mole_local mole; -class molezone { -public: - molezone() - { - init(); - } - void init (void) - { - location = NULL; - levels = NULL; - lines = NULL; - zero(); - } - void zero (void) - { - src = 0.; - snk = 0.; - den = 0.; - column = 0.; - nAtomLim = -1; - xFracLim = 0.; - column_old = 0.; - } - double *location; /** Location of density in non-molecule code, NULL if none exists */ - - /** rate s-1 for molecular charge transfer, nelem from to */ - double src, snk; - - qList* levels; - TransitionList* lines; - - /* Current zone data */ - double den; /** density (cm-3) */ - realnum column; /** total column density in this iteration */ - int nAtomLim; /** atomic number MINUS ONE of element for which is closest to limiting molecule density */ - realnum xFracLim; /** The fraction of that element in this species */ - - /* Historical solution data */ - realnum column_old; /** total column density in previous iteration */ -}; - -extern molezone *null_molezone; - extern molezone *findspecieslocal(const char buf[]);