Changeset 1854 for trunk/source/prt_comment.cpp

Timestamp:

03/17/08 08:09:50 (10 months ago)

Author:

rporter

Message:

A series of changes aimed at treating line overlap automatically. In iso sequences make PopOpc? use poplo of lower level rather than poplo corresponding to sum of all degenerate levels. TauIn? was being incremented with only single line tau, now total tau at line center. RadiationPressure? is basically just a canning of a dozen or so individual radiation pressure calculations. RadiationPressure?2 has an additional term to squelch pressure in lines that by themselves are optically thin, but lie at optically thick energies, which essentially means PopOpc? is effectively much larger than the case for the line alone because other species are contributing to the opacity. This tends to be most important for HeII 1216 because of the strong overlap with LyA. OI - LyB overlap was done manually, now automatically (but this required a revision to the average OI multiplet energy in levels1.dat. There was a small bug in prt_comment.cpp that caused a false positive on LyA radiation pressure changing by large amount in last iteration.

Files:

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

trunk/source/prt_comment.cpp

@@ -2543 +2543 @@
                 if( dense.lgElmtOn[nelem] )
                 {
-                        if( Transitions[ipH_LIKE][nelem][3][ipH2p].Emis->TauIn > 0.2 )
+                        if( Transitions[ipH_LIKE][nelem][ipH3p][ipH2s].Emis->TauIn > 0.2 )
                         {
-                                differ = fabs(1.-Transitions[ipH_LIKE][nelem][3][ipH2p].Emis->TauIn*
-                                  rt.DoubleTau/Transitions[ipH_LIKE][nelem][3][ipH2p].Emis->TauTot)*100.;
+                                differ = fabs(1.-Transitions[ipH_LIKE][nelem][ipH3p][ipH2s].Emis->TauIn*
+                                  rt.DoubleTau/Transitions[ipH_LIKE][nelem][ipH3p][ipH2s].Emis->TauTot)*100.;
 
                                 /* check whether H-alpha optical depth changed by much on last iteration
                                  * no tolerance can be finer than autocv, the tolerance on the
                                  * iterate to convergence command.  It is 15% */
-                                if( ((iterations.lgLastIt && Transitions[ipH_LIKE][nelem][3][ipH2p].Emis->TauIn > 0.8) && 
+                                if( ((iterations.lgLastIt && Transitions[ipH_LIKE][nelem][ipH3p][ipH2s].Emis->TauIn > 0.8) && 
                                         differ > 20.) && wind.windv == 0. )
                                 {
@@ -2559 +2559 @@
                                           elementnames.chElementSym[nelem], 
                                           nelem+1, differ, 
-                                          Transitions[ipH_LIKE][nelem][3][ipH2p].Emis->TauTot );
+                                          Transitions[ipH_LIKE][nelem][ipH3p][ipH2s].Emis->TauTot );
                                         caunin(chLine);
                                         iterations.lgIterAgain = true;
@@ -2717 +2717 @@
         /* say if rad pressure caused by la and la optical depth changed too much */
         differ = fabs(1.-Transitions[ipH_LIKE][ipHYDROGEN][ipH2p][ipH1s].Emis->TauIn/
-          SDIV(Transitions[ipH_LIKE][ipHYDROGEN][ipH2p][ipH1s].Emis->TauTot)*100.);
+          SDIV(Transitions[ipH_LIKE][ipHYDROGEN][ipH2p][ipH1s].Emis->TauTot))*100.;
 
         if( iterations.lgLastIt && (pressure.RadBetaMax > 0.1) &&