Changeset 2034 for branches/c08_branch/source/iso_solve.cpp

Timestamp:

05/10/08 09:03:02 (2 months ago)

Author:

peter

Message:

Merging all changes from mainline upto r2033, except r1902.

Files:

• branches/c08_branch/source/iso_solve.cpp (modified) (15 diffs)

branches/c08_branch/source/iso_solve.cpp

@@ -8 +8 @@
-#include "conv.h"
-#include "dense.h"
+#include "opacity.h"
-#include "elementnames.h"
-#include "h2.h"
@@ -21 +22 @@
-#include "thermal.h"
-#include "trace.h"
-
-/*lint -e662 creation of  out of bound pointer */
-/*lint -e661 creation of  out of bound pointer */
-
-/* iso_solve main routine to call iso_level and determine iso level balances */
@@ -39 +37 @@
-                error;
-        static bool lgFinitePop[LIMELM];
-=true
+[NISO]={true, true}
-        bool lgH_chem_conv;
-        int loop_H_chem;
@@ -47 +45 @@
-        DEBUG_ENTRY( "iso_solve()" );
-
-
+[ipISO]
-        {
-                for( nelem=ipHELIUM; nelem<LIMELM; ++nelem )
-                        lgFinitePop[nelem] = true;
-                lgMustInit = false;
-        }
-
@@ -83 +80 @@
-                /** \todo       2       remove this when this routine really controls helium itself */
-                fixit();  /* why does this routine not control helium?  Shouldn't it? */
+                // can just remove these entirely?, only applies to helium itself anyway.
-                lowsav = dense.IonLow[ipHELIUM];
-                ihisav = dense.IonHigh[ipHELIUM];
@@ -111 +109 @@
-                                if( iso.lgRandErrGen[ipISO] && nzone==0 && !iso.lgErrGenDone[ipISO][nelem] )
-                                {
-
+ 
-                                }
-
-                                /* evaluate recombination rates */
-                                iso_radiative_recomb( ipISO , nelem );
+
+                                if( opac.lgRedoStatic )
+                                {
+                                        if( nelem<=ipHELIUM )
+                                        {
+                                                iso_collapsed_bnl_set( ipISO, nelem );
+
+                                                //iso_collapsed_bnl_print( ipISO, nelem );
+
+                                                iso_collapsed_Aul_update( ipISO, nelem );
+
+                                                iso_collapsed_lifetimes_update( ipISO, nelem );
+
+                                                iso_cascade( ipISO, nelem );
+
+                                                iso_radiative_recomb_effective( ipISO, nelem );
+                                        }
+                                        else
+                                        {
+                                                iso_cascade( ipISO, nelem );
+
+                                                iso_radiative_recomb_effective( ipISO, nelem );
+                                        }
+                                }
-
-                                /* evaluate state specific creation and destruction processes,
@@ -140 +162 @@
-
-                                iso.pop_ion_ov_neut[ipISO][nelem] = 0.;
-
-
+
-
-                                /* zero it out since no population*/
@@ -175 +196 @@
-                }
-        }
+
+        /* setting this flag false means that we have been through this loop at least once already. */  
+        lgMustInit[ipISO] = false;
-
-        if( ipISO == ipHE_LIKE )
@@ -473 +497 @@
-        /* first dimension is multiplicity */
-        char chSpin[3][9]= {"singlets", "doublets", "triplets"};
-        char chISO[2][8]= {"H-like", "He-like"};
-
-#define ITEM_TO_PRINT(A_)       ( lgPrtDeparCoef ? iso.DepartCoef[ipISO][nelem][A_] : StatesElem[ipISO][nelem][A_].Pop )
@@ -495 +518 @@
-                /* give element number and spin */
-                fprintf(ioQQQ," %s %s  %s %s\n",
-
+iso.
-                        elementnames.chElementSym[nelem],
-                        chSpin[is-1],
@@ -501 +524 @@
-
-                /* header with the l states */
-     
+
-                for( i =0; i < nResolved; ++i)
-                {
-
+  
-                }
-                fprintf(ioQQQ,"\n");
@@ -514 +537 @@
-                                continue;
-
-     
+
-
-                        for( il = 0; il < in; ++il)
@@ -520 +543 @@
-                                if( ipISO==ipHE_LIKE && (in==2) && (il==1) && (is==3) )
-                                {
-PrintEfmt("%9.2e", ITEM_TO_PRINT(ipHe2p3P0) )
-PrintEfmt("%9.2e", ITEM_TO_PRINT(ipHe2p3P1) )
-PrintEfmt("%9.2e", ITEM_TO_PRINT(ipHe2p3P2) )
+ "%9.3e ", ITEM_TO_PRINT(ipHe2p3P0) 
+ "%9.3e ", ITEM_TO_PRINT(ipHe2p3P1) 
+ "%9.3e ", ITEM_TO_PRINT(ipHe2p3P2) 
-                                }
-                                else
-                                {
-                                        ipLo = iso.QuantumNumbers2Index[ipISO][nelem][in][il][is];
-PrintEfmt("%9.2e", ITEM_TO_PRINT(ipLo) )
+ "%9.3e ", ITEM_TO_PRINT(ipLo) 
-                                }
-                        }
@@ -538 +561 @@
-                in = StatesElem[ipISO][nelem][il].n;
-                /* prin quan number of collapsed levels */
-     
-PrintEfmt("%9.2e", ITEM_TO_PRINT(il) )
+
+ "%9.3e ", ITEM_TO_PRINT(il) 
-                fprintf(ioQQQ,"\n");
-        }
@@ -589 +612 @@
-        return;
-}
-
-
-/*lint +e662 creation of  out of bound pointer */
-/*lint +e661 creation of  out of bound pointer */