Changeset 2079 for branches/newmole/source/cdspec.cpp

Timestamp:

05/17/08 09:51:43 (8 months ago)

Author:

rjrw

Message:

Merged from trunk r2022:2078

Files:

• branches/newmole/source/cdspec.cpp (modified) (3 diffs)

branches/newmole/source/cdspec.cpp

@@ -318 +318 @@
          * 3    the reflected continuum, same units
          *
-         * 4    diffuse continuous emission outward direction
-         * 5    diffuse continuous emission, reflected
-         *
-         * 6    collisional+recombination lines, outward
-         * 7    collisional+recombination lines, reflected
+         * 4    diffuse emission, lines + continuum, outward
+         * 5    diffuse emission, lines + continuum, reflected
+         *
+         * 6    diffuse continuous emission outward direction
+         * 7    diffuse continuous emission, reflected
          *
          * 8    total transmitted, lines and continuum
@@ -333 +333 @@
         int nOption ,
 
-        /* the number of cells + 1*/
-        long int nEnergy ,
+        /* the number of cells */
+        long int nEnergy,
+
+        /* the index of the lowest and highest energy bounds to use. */
+        long ipLoEnergy,
+        long ipHiEnergy,
 
         /* the returned spectrum, same size is two energy spectra (see option), returns nEnergy -1 pts */
@@ -340 +344 @@
 
 {
-        /* this pointer will bet set to one of the cloudy continuum arrays */
-        realnum *cont , 
-                refac;
-        long int ncell , j;
-
-        /* flag saying whether we will need to free cont at the end */
-        bool lgFREE;
+        realnum refac;
 
         DEBUG_ENTRY( "cdSPEC2()" );
 
+        ASSERT( ipLoEnergy >= 0 );
+        ASSERT( ipLoEnergy < ipHiEnergy );
+        ASSERT( ipHiEnergy < rfield.nupper );
+        ASSERT( nEnergy == (ipHiEnergy-ipLoEnergy+1) );
+        ASSERT( nEnergy >= 2 );
+
         ASSERT( nOption <= NUM_OUTPUT_TYPES );
 
-        if( nOption == 1 )
-        {
-                /* this is the incident continuum, col 2 of punch continuum command */
-                cont = rfield.flux_total_incident;
-                lgFREE = false;
-        }
-        else if( nOption == 2 )
-        {
-                /* the attenuated transmitted continuum, no diffuse emission,
-                 * col 3 of punch continuum command */
-                cont = rfield.flux;
-                lgFREE = false;
-        }
-        else if( nOption == 3 )
-        {
-                /* reflected incident continuum, col 6 of punch continuum command */
-                lgFREE = false;
-                cont = rfield.ConRefIncid;
-        }
-        else if( nOption == 4 )
-        {
-                /* diffuse continuous emission outward direction  */
-                cont = (realnum*)MALLOC( sizeof(realnum)*(size_t)rfield.nupper );
-                /* need to free the vector once done */
-                lgFREE = true;
-                refac = (realnum)radius.r1r0sq*geometry.covgeo;
-                for( j=0; j<rfield.nflux; ++j)
-                {
-                        cont[j] = rfield.ConEmitOut[j]*refac;
-                }
-        }
-        else if( nOption == 5 )
-        {
-                /* reflected diffuse continuous emission */
-                cont = (realnum*)MALLOC( sizeof(realnum)*(size_t)rfield.nupper );
-                /* need to free the vector once done */
-                lgFREE = true;
-                for( j=0; j<rfield.nflux; ++j)
-                {
-                        cont[j] = rfield.ConEmitReflec[j];
-                }
-        }
-        else if( nOption == 6 )
-        {
-                /* all outward lines,   */
-                cont = (realnum*)MALLOC( sizeof(realnum)*(size_t)rfield.nupper );
-                /* need to free the vector once done */
-                lgFREE = true;
-                /* correct back to inner radius */
-                refac = (realnum)radius.r1r0sq*geometry.covgeo;
-                for( j=0; j<rfield.nflux; ++j)
-                {
-                        cont[j] = rfield.outlin[j]*refac;
-                }
-        }
-        else if( nOption == 7 )
-        {
-                /* all reflected lines */
-                if( geometry.lgSphere )
-                {
-                        refac = 0.;
-                }
-                else
-                {
-                        refac = 1.;
-                }
-
-                cont = (realnum*)MALLOC( sizeof(realnum)*(size_t)rfield.nupper );
-                /* need to free the vector once done */
-                lgFREE = true;
-                for( j=0; j<rfield.nflux; ++j)
-                {
-                        /* units of lines here are to cancel out with tricks applied to continuum cells
-                         * when finally extracted below */
-                        cont[j] = rfield.reflin[j]*refac;
-                }
-        }
-        else if( nOption == 8 )
-        {
-                /* total transmitted continuum */
-                cont = (realnum*)MALLOC( sizeof(realnum)*(size_t)rfield.nupper );
-                /* need to free the vector once done */
-                lgFREE = true;
-                /* correct back to inner radius */
-                refac = (realnum)radius.r1r0sq*geometry.covgeo;
-                for( j=0; j<rfield.nflux; ++j)
-                {
-                        /* units of lines here are to cancel out with tricks applied to continuum cells
-                         * when finally extracted below */
-                        cont[j] = (rfield.ConEmitOut[j]+ rfield.outlin[j])*refac
-                                          + rfield.flux[j]*(realnum)radius.r1r0sq;
-                }
-        }
-        else if( nOption == 9 )
-        {
-                /* total reflected continuum */
-                cont = (realnum*)MALLOC( sizeof(realnum)*(size_t)rfield.nupper );
-                /* need to free the vector once done */
-                lgFREE = true;
-                for( j=0; j<rfield.nflux; ++j)
-                {
-                        /* units of lines here are to cancel out with tricks applied to continuum cells
-                         * when finally extracted below */
-                        cont[j] = ((rfield.ConRefIncid[j]+rfield.ConEmitReflec[j]) +
+        for( long i = 0; i < nEnergy; i++ )
+        {
+                long j = ipLoEnergy + i;
+
+                if( j >= rfield.nflux )
+                {
+                        ReturnedSpectrum[i] = SMALLFLOAT;
+                        continue;
+                }
+
+                if( nOption == 1 )
+                {
+                        /* this is the incident continuum, col 2 of punch continuum command */
+                        ReturnedSpectrum[i] = rfield.flux_total_incident[j];
+                }
+                else if( nOption == 2 )
+                {
+                        /* the attenuated transmitted continuum, no diffuse emission,
+                         * col 3 of punch continuum command */
+                        ReturnedSpectrum[i] = rfield.flux[j];
+                }
+                else if( nOption == 3 )
+                {
+                        /* reflected incident continuum, col 6 of punch continuum command */
+                        ReturnedSpectrum[i] = rfield.ConRefIncid[j];
+                }
+                else if( nOption == 4 )
+                {
+                        /* correct back to inner radius */
+                        refac = (realnum)radius.r1r0sq*geometry.covgeo;
+                        ReturnedSpectrum[i] = (rfield.outlin[j]+rfield.ConEmitOut[j])*refac;
+                }
+                else if( nOption == 5 )
+                {
+                        /* all reflected diffuse emission */
+                        if( geometry.lgSphere )
+                        {
+                                refac = 0.;
+                        }
+                        else
+                        {
+                                refac = 1.;
+                        }
+
+                        ReturnedSpectrum[i] = (rfield.reflin[j]+rfield.ConEmitReflec[j])*refac;
+                }
+                else if( nOption == 6 )
+                {
+                        /* correct back to inner radius */
+                        refac = (realnum)radius.r1r0sq*geometry.covgeo;
+                        ReturnedSpectrum[i] = rfield.outlin[j]*refac;
+                }
+                else if( nOption == 7 )
+                {
+                        /* all reflected line emission */
+                        if( geometry.lgSphere )
+                        {
+                                refac = 0.;
+                        }
+                        else
+                        {
+                                refac = 1.;
+                        }
+
+                        ReturnedSpectrum[i] = rfield.reflin[j]*refac;
+                }
+                else if( nOption == 8 )
+                {
+                        /* total transmitted continuum */
+                        /* correct back to inner radius */
+                        refac = (realnum)radius.r1r0sq*geometry.covgeo;
+                        ReturnedSpectrum[i] = (rfield.ConEmitOut[j]+ rfield.outlin[j])*refac
+                                + rfield.flux[j]*(realnum)radius.r1r0sq;
+                }
+                else if( nOption == 9 )
+                {
+                        /* total reflected continuum */
+                        ReturnedSpectrum[i] = ((rfield.ConRefIncid[j]+rfield.ConEmitReflec[j]) +
                                 rfield.reflin[j]);
                 }
-        }
-        else if( nOption == 10 )
-        {
-                /* this is exp(-tau) */
-                cont = (realnum*)MALLOC( sizeof(realnum)*(size_t)rfield.nupper );
-                /* need to free the vector once done */
-                lgFREE = true;
-                for( j=0; j<nEnergy; ++j)
-                {
+                else if( nOption == 10 )
+                {
+                        /* this is exp(-tau) */
                         /* This is the TOTAL attenuation in both the continuum and lines.  
                          * Jon Miller discovered that the line attenuation was missing in 07.02 */
-                        cont[j] = opac.ExpmTau[j]*rfield.trans_coef_total[j];
-                }
-        }
-        else
-        {
-                fprintf(ioQQQ," cdSPEC called with impossible nOption (%i)\n", nOption);
-                cdEXIT(EXIT_FAILURE);
-        }
-
-        /* now generate the continua */
-        for( ncell = 0; ncell < nEnergy; ++ncell )
-        {
-        if( ncell >= rfield.nflux )
-                {
-                        ReturnedSpectrum[ncell] = SMALLFLOAT;
+                        ReturnedSpectrum[i] = opac.ExpmTau[j]*rfield.trans_coef_total[j];
                 }
                 else
                 {
-                        ReturnedSpectrum[ncell] = cont[ncell];
-                }
-                ASSERT( ReturnedSpectrum[ncell] >=0.f );
-        }
-
-        /* need to free the vector once done if this flag was set */
-        if( lgFREE )
-        {
-                free(cont);
-        }
+                        fprintf(ioQQQ," cdSPEC called with impossible nOption (%i)\n", nOption);
+                        cdEXIT(EXIT_FAILURE);
+                }
+
+                ASSERT( ReturnedSpectrum[i] >=0.f );
+        }
+
         return;
 }