Changeset 2034 for branches/c08_branch/source/iso_photo.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_photo.cpp (modified) (4 diffs)

branches/c08_branch/source/iso_photo.cpp

@@ -11 +11 @@
 #include "gammas.h"
 #include "iso.h"
-/*lint -e661 Possible access of out-of-bounds pointer*/
-/*lint -e662 (Warning -- Possible creation of out-of-bounds pointer  */
 
 void iso_photo(
@@ -71 +69 @@
 
         /* option to print ground state photoionization rates */
-        if( /*nelem==0*/ trace.lgTrace && trace.lgHBug && false )
+        if( trace.lgTrace && trace.lgIsoTraceFull[ipISO] && (nelem == trace.ipIsoTrace[ipISO]) )
         {
                 GammaPrt(iso.ipIsoLevNIonCon[ipISO][nelem][0],
                         rfield.nflux,
                         iso.ipOpac[ipISO][nelem][0],
-                  ioQQQ,
-                  iso.gamnc[ipISO][nelem][0],iso.gamnc[ipISO][nelem][0]*0.05);
-        }
-
-        {
-                /*@-redef@*/
-                enum {DEBUG_LOC=false};
-                /*@+redef@*/
-                if( DEBUG_LOC )
-                {
-                        /* option to print ground state photoionization rates */
-                        if( DEBUG_LOC && nelem==ipHELIUM && ipISO==ipH_LIKE && nzone > 290)
-                        {
-                                GammaPrt(iso.ipIsoLevNIonCon[ipISO][nelem][0],
-                                        rfield.nflux,
-                                        iso.ipOpac[ipISO][nelem][0],
-                                ioQQQ,
-                                iso.gamnc[ipISO][nelem][0],iso.gamnc[ipISO][nelem][0]*0.05);
-                        }
-                }
+                        ioQQQ,
+                        iso.gamnc[ipISO][nelem][0],
+                        iso.gamnc[ipISO][nelem][0]*0.05);
         }
 
@@ -148 +129 @@
                 if( DEBUG_LOC )
                 {
-                        n = 1;
-                        if( ipISO==ipHE_LIKE && nelem==ipHELIUM && nzone > 200 )
-                        {
-                                GammaPrt(iso.ipIsoLevNIonCon[ipISO][nelem][n],
-                                        iso.ipIsoLevNIonCon[ipISO][nelem][ipH1s]-1,
-                                        iso.ipOpac[ipISO][nelem][n],
-                                        ioQQQ,
-                                        iso.gamnc[ipISO][nelem][n],
-                                        iso.gamnc[ipISO][nelem][n]*0.05);
-                        }
-                }
-        }
-
-        {
-                /*@-redef@*/
-                enum {DEBUG_LOC=false};
-                /*@+redef@*/
-                if( DEBUG_LOC )
-                {
-                        if( ipISO==1 && nelem==1 && nzone > 200 )
-                                fprintf(ioQQQ,"DEBUG isophoto\t%.2f\t%.4e\n",
-                                fnzone, 
-                                iso.gamnc[ipISO][nelem][1]);
-                }
-        }
-
-        {
-                /*@-redef@*/
-                enum {DEBUG_LOC=false};
-                /*@+redef@*/
-                if( DEBUG_LOC )
-                {
-                        if( nelem==0 )
+                        if( nelem==ipHYDROGEN )
                         {
                                 fprintf(ioQQQ," buggbugg hphotodebugg%li\t%.2e\t%.2e\t%.2e\t%.2e\t%.2e\t%.2e\n",
@@ -232 +181 @@
         return;
 }
-/*lint +e661 Possible access of out-of-bounds pointer*/
-/*lint +e662 (Warning -- Possible creation of out-of-bounds pointer  */