Changeset 1142 for trunk/source/helike.cpp

Timestamp:

05/21/07 12:12:52 (20 months ago)

Author:

rporter

Message:

merge changes from porter branch. These are all iso refactoring changes. Test suite has zero botches.

Files:

• trunk/source/helike.cpp (modified) (6 diffs)

trunk/source/helike.cpp

@@ -69 +69 @@
 /*lint -e662 creation of  out of bound pointer */
 /*lint -e661 creation of  out of bound pointer */
-
-/*      The Elevels data type, and then the iso.quant_desig[ipHE_LIKE] structure,
- *  which contain the quantum numbers n,l, and s for a given
- *  energy level, are defined in iso.h, for use in multiple subroutines. */
-
-/*typedef struct { 
-        long n;
-        long s;
-        long l;
-} Elevels; iso.h */ 
-
-/* An array of structures each containing for a given element, n,l, and s
- * s=0 for singlets, s=1 for triplets
- * in helike.h
-static Elevels **iso.quant_desig[ipHE_LIKE]; */
 
 /*static long ipLev,globalZ;*/
@@ -172 +157 @@
 
                                 /* evaluate recombination rates */
-                                /* if the flag iso.lgHugeCaseB[ipISO] is true, cloudy exits in HeRecom(). */
                                 HeRecom(nelem);
 
@@ -303 +287 @@
 
                 ipFirstCollapsed= iso.numLevels_local[ipHE_LIKE][nelem]-iso.nCollapsed_local[ipHE_LIKE][nelem];
-                nResolved = iso.quant_desig[ipHE_LIKE][nelem][ipFirstCollapsed-1].n;
+                nResolved = StatesElem[ipHE_LIKE][nelem][ipFirstCollapsed-1].n;
                 ASSERT( nResolved == iso.n_HighestResolved_local[ipHE_LIKE][nelem] );
                 ASSERT(nResolved > 0 );
@@ -344 +328 @@
         for( il = ipFirstCollapsed; il < iso.numLevels_local[ipHE_LIKE][nelem]; ++il)
         {
-                in = iso.quant_desig[ipHE_LIKE][nelem][il].n;
+                in = StatesElem[ipHE_LIKE][nelem][il].n;
 
                 /* prin quan number of collapsed levels */
@@ -365 +349 @@
 
                 ipFirstCollapsed= iso.numLevels_local[ipHE_LIKE][nelem]-iso.nCollapsed_local[ipHE_LIKE][nelem];
-                nResolved = iso.quant_desig[ipHE_LIKE][nelem][ipFirstCollapsed-1].n;
+                nResolved = StatesElem[ipHE_LIKE][nelem][ipFirstCollapsed-1].n;
                 ASSERT( nResolved == iso.n_HighestResolved_local[ipHE_LIKE][nelem] );
                 ASSERT(nResolved > 0 );
@@ -407 +391 @@
         for( il = ipFirstCollapsed; il < iso.numLevels_local[ipHE_LIKE][nelem]; ++il)
         {
-                in = iso.quant_desig[ipHE_LIKE][nelem][il].n;
+                in = StatesElem[ipHE_LIKE][nelem][il].n;
                 /* prin quan number of collapsed levels */
                 fprintf(ioQQQ," %2ld           ",in);