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

Timestamp:

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

Author:

peter

Message:

Merging all changes from mainline upto r2033, except r1902.

Files:

• branches/c08_branch/source/init_coreload.cpp (modified) (2 diffs)

branches/c08_branch/source/init_coreload.cpp

@@ -193 +193 @@
         {
                 iso.n_HighestResolved_max[ipH_LIKE][nelem] = 5;
-                iso.nCollapsed_max[ipH_LIKE][nelem] = 10;
-        }
-
-        iso.n_HighestResolved_max[ipH_LIKE][ipHYDROGEN] = 6;
-        iso.n_HighestResolved_max[ipH_LIKE][ipHELIUM] = 6;
-
-        iso.nCollapsed_max[ipH_LIKE][ipHYDROGEN] = 20;
-        iso.nCollapsed_max[ipH_LIKE][ipHELIUM] = 20;
+                iso.nCollapsed_max[ipH_LIKE][nelem] = 2;
+        }
+
+        iso.n_HighestResolved_max[ipH_LIKE][ipHYDROGEN] = 10;
+        iso.n_HighestResolved_max[ipH_LIKE][ipHELIUM] = 10;
+
+        iso.nCollapsed_max[ipH_LIKE][ipHYDROGEN] = 15;
+        iso.nCollapsed_max[ipH_LIKE][ipHELIUM] = 15;
 
         /* variables for He-like sequence */
@@ -213 +213 @@
                 /* put at least three resolved and 1 collapsed in every element for he-like */
                 iso.n_HighestResolved_max[ipHE_LIKE][nelem] = 3;
-                /** \todo       2       Change this to higher number. */
                 iso.nCollapsed_max[ipHE_LIKE][nelem] = 1;
         }
 
-        /* >>chng 05 dec 21, from 10 to 20, greater precision without too much more time */
+        iso.n_HighestResolved_max[ipHE_LIKE][ipHELIUM] = 6;
         iso.nCollapsed_max[ipHE_LIKE][ipHELIUM] = 20;
-        /* >>chng 05 dec 21, make 6 rather than n=7 default max resolved for Helium itself */
-        iso.n_HighestResolved_max[ipHE_LIKE][ipHELIUM] = 6;
-        /* And n=5 for carbon, nitrogen, oxygen, and iron because they are quite abundant */
+
+        /* And n=5 for these because they are most abundant */
         iso.n_HighestResolved_max[ipHE_LIKE][ipCARBON] = 5;
         iso.n_HighestResolved_max[ipHE_LIKE][ipNITROGEN] = 5;
         iso.n_HighestResolved_max[ipHE_LIKE][ipOXYGEN] = 5;
+        iso.n_HighestResolved_max[ipHE_LIKE][ipNEON] = 5;
+        iso.n_HighestResolved_max[ipHE_LIKE][ipSILICON] = 5;
+        iso.n_HighestResolved_max[ipHE_LIKE][ipMAGNESIUM] = 5;
+        iso.n_HighestResolved_max[ipHE_LIKE][ipSULPHUR] = 5;
         iso.n_HighestResolved_max[ipHE_LIKE][ipIRON] = 5;
-        iso.n_HighestResolved_max[ipHE_LIKE][ipZINC] = 5;
+        /* also set this, for exercising any possible issues with biggest charge models */
+        iso.n_HighestResolved_max[ipHE_LIKE][LIMELM-1] = 5;
 
         iso.chISO[ipH_LIKE] = "H-like ";