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

Timestamp:

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

Author:

peter

Message:

Merging all changes from mainline upto r2033, except r1902.

Files:

• branches/c08_branch/source/iso_collide.cpp (modified) (3 diffs)

branches/c08_branch/source/iso_collide.cpp

@@ -63 +63 @@
          * factor.  The result was a collisional recombination that had residual exponentials of
          * the form exp(x/kT), which blew up at small T.        */
-        if( !iso.lgLevelsLowered[ipISO][nelem] && ipISO == ipHE_LIKE )
-                iso.ColIoniz[ipISO][nelem][iso.numLevels_max[ipISO][nelem]-1] *= 1.E5;
-
-        //if( !iso.lgLevelsLowered[ipISO][nelem] && ipISO == ipH_LIKE )
-        //      iso.ColIoniz[ipISO][nelem][iso.numLevels_max[ipISO][nelem]-1] *= 1.E5;
-
-        fixit(); /* h-like should be arbitrarily scaled at highest level also. */
-        
-        /* hummer and storey option for case b kills coll ioniz from 1 and 2 */
-        if( opac.lgCaseB_HummerStorey )
-        {
-                if( ipISO == ipH_LIKE )
-                {
-                        iso.ColIoniz[ipISO][nelem][ipH1s] = 0.;
-                        iso.ColIoniz[ipISO][nelem][ipH2p] = 0.;
-                        iso.ColIoniz[ipISO][nelem][ipH2s] = 0.;
-                }
-                else if( ipISO == ipHE_LIKE )
-                {
-                        iso.ColIoniz[ipISO][nelem][ipHe1s1S] = 0.;
-                        iso.ColIoniz[ipISO][nelem][ipHe2s1S] = 0.;
-                        iso.ColIoniz[ipISO][nelem][ipHe2p1P] = 0.;
-                        fixit();  
-                        /* Some case b Hummer & Storey models have botches
-                 * if these are turned off.  But should they be?
-                 * Or should we change the model?  What defines HS? */
-#if     0                
-                        iso.ColIoniz[ipISO][nelem][ipHe2s3S] = 0.;
-                        iso.ColIoniz[ipISO][nelem][ipHe2p3P0] = 0.;
-                        iso.ColIoniz[ipISO][nelem][ipHe2p3P1] = 0.;
-                        iso.ColIoniz[ipISO][nelem][ipHe2p3P1] = 0.;
-#endif                  
-                }
-                else
-                        TotalInsanity();
+        if( !iso.lgLevelsLowered[ipISO][nelem] )
+        {
+                iso.ColIoniz[ipISO][nelem][iso.numLevels_max[ipISO][nelem]-1] *= 10.;/*1.E5;*/
+                iso.ColIoniz[ipISO][nelem][iso.numLevels_max[ipISO][nelem]-1] *= 10.;/*1.E5;*/
         }
         
@@ -297 +266 @@
                                                 Transitions[ipISO][nelem][ipHi][ipLo].Coll.csi[ipALPHA] = 0.;
                                         }
+                                        else
+                                                TotalInsanity();
                                         
                                         if( N_(ipHi) != N_(ipLo) )
@@ -323 +294 @@
                                 }
                         }
-
-                        /* this kills collisional excitation from n=1 and n=2
-                         * in the case b hummer and storey option */
-                        if( opac.lgCaseB_HummerStorey && ipISO == ipH_LIKE )
-                        {
-                                for( ipLo=0; ipLo<=ipH2p; ipLo++ )
+                }
+                
+                /* the case b hummer and storey option,
+                 * this kills collisional excitation and ionization from n=1 and n=2 */
+                if( opac.lgCaseB_HummerStorey && ipISO==ipH_LIKE )
+                {
+                        for( ipLo=0; ipLo<iso.numLevels_max[ipISO][nelem]-1; ipLo++ )
+                        {
+                                if( N_(ipLo)>=3 )
+                                        break;
+
+                                iso.ColIoniz[ipISO][nelem][ipLo] = 0.;
+
+                                for( ipHi=ipLo+1; ipHi<iso.numLevels_max[ipISO][nelem]; ipHi++ )
                                 {
-                                        for( ipHi=3; ipHi<iso.numLevels_max[ipISO][nelem]; ipHi++ )
-                                        {
-                                                Transitions[ipISO][nelem][ipHi][ipLo].Coll.cs = 0.;
-                                                Transitions[ipISO][nelem][ipHi][ipLo].Coll.csi[ipPROTON] = 0.;
-                                                Transitions[ipISO][nelem][ipHi][ipLo].Coll.csi[ipHE_PLUS] = 0.;
-                                                Transitions[ipISO][nelem][ipHi][ipLo].Coll.csi[ipALPHA] = 0.;
-                                        }
+                                        Transitions[ipISO][nelem][ipHi][ipLo].Coll.cs = 0.;
+                                        Transitions[ipISO][nelem][ipHi][ipLo].Coll.csi[ipPROTON] = 0.;
+                                        Transitions[ipISO][nelem][ipHi][ipLo].Coll.csi[ipHE_PLUS] = 0.;
+                                        Transitions[ipISO][nelem][ipHi][ipLo].Coll.csi[ipALPHA] = 0.;
                                 }
                         }
                 }
-                
+
                 /***********************************************************************
                  *                                                                     *