Changeset 2022

Timestamp:

05/05/08 04:38:15 (1 week ago)

Author:

gary

Message:

prt_lines_helium.cpp - bug fix - logic for Case B HeI line wavelengths was incorrect, memory overrun
rt_tau_inc.cpp - tidy up comments - no change in functionality

Files:

• trunk/source/prt_lines_helium.cpp (modified) (1 diff)
• trunk/source/rt_tau_inc.cpp (modified) (9 diffs)

trunk/source/prt_lines_helium.cpp

@@ -68 +68 @@
-
-        /* store labels for all case b HeI lines in case we assert case b 
-
-if( LineSave.ipass < 0 )
-       atmdat.nCaseBHeI = 0;
-else if( LineSave.ipass == 0 && atmdat.nCaseBHeI>0)
-{
-/* now create space but only if there are He I lines - this is not the
-cas
+, =0, malloc then set wl
+static bool lgMustMalloc=true;
+if( LineSave.ipass == 0 && atmdat.nCaseBHeI>0 && lgMustMalloc )
+{
+       /* second time through - on ipass=-1 we counted number of lines
+ * atmdat.nCaseBHeI, now create space but only if there are He I lines 
+this is not don
-                atmdat.CaseBWlHeI = (realnum*)MALLOC( sizeof(realnum)*atmdat.nCaseBHeI);
-
-
+
+
+
-
-        /* this is the main printout, where line intensities are entered into the stack */

trunk/source/rt_tau_inc.cpp

@@ -51 +51 @@
-        rt.mas_lo = 0;
-
-
-
+
-        for( ipISO=ipH_LIKE; ipISO<NISO; ++ipISO )
-        {
@@ -60 +59 @@
-                         * for element He is 1 for He-like (HeI) and 2 for H-like (HeII) */
-                        int ion = nelem+1-ipISO;
-
-
+
-                        if( ion <=dense.IonHigh[nelem] && dense.xIonDense[nelem][ion] > dense.density_low_limit )
-                        {
-                                factor = dense.xIonDense[nelem][ion];
-                                /* >>chng 06 aug 17, should go to numLevels_local instead of _max. */
-                                for( ipHi=1; ipHi < iso.numLevels_local[ipISO][nelem]; ipHi++ )
-                                {
@@ -74 +71 @@
-                                        for( ipLo=0; ipLo < ipHi; ipLo++ )
-                                        {
-
-
+
-                                                double save;
-
@@ -91 +87 @@
-                                }
-                                ipLo = 0;
-l
+L
-                                for( ipHi=StatesElem[ipISO][nelem][iso.numLevels_max[ipISO][nelem]-1].n; ipHi < iso.nLyman[ipISO]; ipHi++ )
-                                {
@@ -113 +109 @@
-         * same routine does wind and static,
-         * does not start from 0 since first line is dummy */
-        /*DumpLine( &TauLines[ipT63] );*/
-        for( i=1; i <= nLevel1; i++ )
-        {
@@ -162 +157 @@
-                dense.xIonDense[HFLines[i].Hi->nelem-1][HFLines[i].Hi->IonStg-1] = save;
-        }
-#       if 0
-        {
-                /* this is an option to print out one of the two photon continua */
-                /*@-redef@*/
-                enum {DEBUG_LOC=false};
-                /*@+redef@*/
-                if( DEBUG_LOC )
-                {       
-                        fprintf(ioQQQ,"isotope pops\t%.3e\t%.3e\t%.3e\t%.3e\n",
-                                /*HFLines[0].PopOpc , HFLines[0].opacity,
-                                TauLines[ipH21cm].PopOpc , TauLines[ipH21cm].opacity);*/
-                                HFLines[0].TauIn , HFLines[0].TauTot,
-                                TauLines[ipH21cm].TauIn , TauLines[ipH21cm].TauTot);
-                }
-        }
-#       endif
-
-co
+CO
-        for( i=0; i < nCORotate; i++ )
-        {
@@ -194 +173 @@
-        H2_RT_tau_inc();
-
-Atomic & Molecular
+ database
-        for(i=0; i < linesAdded2; i++)
-        {
@@ -204 +183 @@
-        if( wind.windv == 0. )
-        {
-
-
+
-                t_fe2ovr_la::Inst().tau_inc();
-        }
@@ -216 +194 @@
-
-        if( trace.lgTrace )
-        {
-                fprintf( ioQQQ, " RT_tau_inc returns.\n" );
-
+
-        return;
-}