Changeset 1875 for trunk/source/helike_einsta.cpp

Timestamp:

03/22/08 04:44:42 (10 months ago)

Author:

rporter

Message:

trunk/source/helike_einsta.cpp - change treatment for he-like deltan=0 yrare Auls. These were largely overpredicted. It has little effect on low-lying lines, but caused unphysically large masers in models with moderately large number of levels are strong radiation field. It also seems to have been the cause of the problem I've been having with high turbulence models. Six test suite asserts were adjusted, including those in close.txt.

Files:

• trunk/source/helike_einsta.cpp (modified) (3 diffs)

trunk/source/helike_einsta.cpp

@@ -663 +663 @@
                         {
                                 /* Do same-n transitions. */
-                                if( nLo == nHi )
+                                if( nLo==nHi && lHi<=2 && lLo<=2 )
                                 {
                                         /* These are 2p3Pj to 2s3S fits to (low Z) Porquet & Dubau (2000) & 
@@ -708 +708 @@
                                                         Aul = 6.646E7 * pow((double)nelem,1.5) / pow((double)nHi, 5.077);
                                                 }
-                                                else /*if( (lHi == 2) && (sHi == 3)  && (lLo == 1) ) */
+                                                else 
                                                 {
+                                                        ASSERT( (lHi == 2) && (sHi == 3)  && (lLo == 1) );
                                                         Aul = 3.9E6 * pow((double)nelem,1.6) / pow((double)nHi, 4.9);
                                                         if( (lHi >2) || (lLo > 2) )
@@ -721 +722 @@
 
                                 /* assume transitions involving F and higher orbitals are hydrogenic.   */
-                                else if( ((lHi > 2) || (lLo > 2)) )
+                                else if( (nHi > nLo) && ((lHi > 2) || (lLo > 2)) )
                                 {
-                                        ASSERT( nHi > nLo );
                                         /*lint -e790 integral to float */
                                         Aul = H_Einstein_A(nHi ,lHi , nLo , lLo , nelem);