Changeset 1199

Timestamp:

06/17/07 09:56:08 (1 year ago)

Author:

gary

Message:

hydrorecom.cpp - RP move recom debug print statement

init_coreload.cpp - comment change

mole_h2_create.cpp - clean up comments

parse_print.cpp - add print version commmand - will give code, compiler, and OS version

prt_comment.cpp - small change in format of print statement

prt_lines_continuum.cpp - clean up comments, remove redundant block

rt_line_all.cpp - minor change in comments

version.h - update comments

Files:

• trunk/source/date.h (modified) (1 diff)
• trunk/source/hydrorecom.cpp (modified) (1 diff)
• trunk/source/init_coreload.cpp (modified) (1 diff)
• trunk/source/mole_h2_create.cpp (modified) (2 diffs)
• trunk/source/parse_print.cpp (modified) (1 diff)
• trunk/source/prt_comment.cpp (modified) (1 diff)
• trunk/source/prt_lines_continuum.cpp (modified) (7 diffs)
• trunk/source/rt_line_all.cpp (modified) (1 diff)
• trunk/source/version.h (modified) (1 diff)

trunk/source/date.h

@@ -9 +9 @@
-#define YEAR    107
-#define MONTH   5
-2
+7

trunk/source/hydrorecom.cpp

@@ -254 +254 @@
-                /*end sanity check */
-
+                if( (trace.lgTrace && trace.lgIsoTraceFull[ipH_LIKE]) && (nelem == trace.ipIsoTrace[ipH_LIKE]) )
+                {
+                        fprintf( ioQQQ, "       HydroRecom eval rec cof" );
+                        for( n=ipH1s; n < iso.numLevels_max[ipH_LIKE][nelem]; n++ )
+                        {
+                                fprintf( ioQQQ,PrintEfmt("%10.3e", iso.RadRecomb[ipH_LIKE][nelem][n][ipRecRad]) );
+                        }
+                        fprintf( ioQQQ, "\n" );
+                }
-        } 
-        /* end branch checking on change in temperature */
-
-        if( (trace.lgTrace && trace.lgIsoTraceFull[ipH_LIKE]) && (nelem == trace.ipIsoTrace[ipH_LIKE]) )
-        {
-                fprintf( ioQQQ, "       HydroRecom eval rec cof" );
-                for( n=ipH1s; n < iso.numLevels_local[ipH_LIKE][nelem]; n++ )
-                {
-                        fprintf( ioQQQ,PrintEfmt("%10.3e", iso.RadRecomb[ipH_LIKE][nelem][n][ipRecRad]) );
-                }
-                fprintf( ioQQQ, "\n" );
-        }
-
-        /* confirm that we have good rec coef at bottom and top of h atom */

trunk/source/init_coreload.cpp

@@ -162 +162 @@
-                strncpy( mode, "?????", 6 );
-
-
+, including compiler version
-        sprintf(version.chInfo , 
-                "cdInit compiled on %s in OS %s using the %s %i compiler in %s mode." ,

trunk/source/mole_h2_create.cpp

@@ -121 +121 @@
-        {
-                /* the current data set is limited to vib hi <= 3 */
-                /* VIB_COLLID is highest vib state with collision data */
-                /* will define collision rates for all possible transitions within X */
-                CollRateFit[nColl] = (float*****)MALLOC(sizeof(float****)*(unsigned)(h2.nVib_hi[iElecHi]+1) );
-/*VIB_COLLID+1*/
-/*VIB_COLLID*/
+
+
-                {
-                        CollRateFit[nColl][iVibHi] = (float****)MALLOC(sizeof(float***)*(unsigned)(h2.nRot_hi[iElecHi][iVibHi]+1) );
@@ -132 +131 @@
-                        {
-                                CollRateFit[nColl][iVibHi][iRotHi] = (float***)MALLOC(sizeof(float**)*(unsigned)(h2.nVib_hi[iElecHi]+1) );
-/*VIB_COLLID+1*/
-/*VIB_COLLID+1*/
+
+
-                                {
-                                        CollRateFit[nColl][iVibHi][iRotHi][iVibLo] = (float**)MALLOC(sizeof(float*)*(unsigned)(h2.nRot_hi[iElecHi][iVibLo]+1) );

trunk/source/parse_print.cpp

@@ -94 +94 @@
-        }
-
+        else if( nMatch("VERS",chCARD_CAPS) )
+        {
+                /* print compiler and code version information */
+                fprintf( ioQQQ, "\nThis is Cloudy, version %s\n%s\n\n" , 
+                        version.chVersion,
+                        version.chInfo );
+        }
+
-        /* option to print departure coefficients in addition to level pops 
-he
+He-
-         * element name, if not recognized, does hydrogen
-         * so with no options prints hydrogen itself */

trunk/source/prt_comment.cpp

@@ -453 +453 @@
-                        warnin(chLine);
-                        /* write same thing directly to output (above will be sorted later) */
-
+\n\n
-
-                        /* the case b command can cause this problem - say so if case b was set */

trunk/source/prt_lines_continuum.cpp

@@ -38 +38 @@
-                " start continua");
-
-        /* memory not allocated until ipass >= 0 */
-        if( LineSave.ipass > 0 )
-        {
-                LineSv[LineSave.nsum].sumlin[0] = 0.;
-                LineSv[LineSave.nsum].sumlin[1] = 0.;
-        }
-
-        /***********************************************************************
-         * stuff in Bac ratio - continuum above the Balmer Jump 
@@ -79 +72 @@
-        bac = (f1 - f2);
-
-
+
+
+
+
+
-        if( LineSave.ipass > 0 )
-        {
@@ -138 +135 @@
-        /******************************************************************************
-         * "cout" , 3646,  this is outward residual continuum at peak of Balmer Jump  *
-     
+metry
-         ******************************************************************************/
-        /* >>chng 00 dec 02, remove opac.tmn */
@@ -149 +146 @@
-                rfield.widflx[iso.ipIsoLevNIonCon[ipH_LIKE][ipHYDROGEN][2]-2]/*/radius.GeoDil /opac.tmn[iso.ipIsoLevNIonCon[ipH_LIKE][ipHYDROGEN][2]-2]*/;
-
-b
+B
-        bac = (f1 - f2)*0.250*0.250*EN1RYD*radius.r1r0sq;
-
@@ -178 +175 @@
-        /* >>chng 00 dec 19, remove / radius.GeoDil */
-        f1 = rfield.ConEmitReflec[iso.ipIsoLevNIonCon[ipH_LIKE][ipHYDROGEN][2]-1]/
-/*/radius.GeoDil /opac.tmn[iso.ipIsoLevNIonCon[ipH_LIKE][ipHYDROGEN][2]-1]*/
+
-
-        f2 = rfield.ConEmitReflec[iso.ipIsoLevNIonCon[ipH_LIKE][ipHYDROGEN][2]-2]/
-/*/radius.GeoDil /opac.tmn[iso.ipIsoLevNIonCon[ipH_LIKE][ipHYDROGEN][2]-2]*/
-
-b
+
+
+B
-        bac = (f1 - f2)*0.250*0.250*EN1RYD;
-
@@ -234 +231 @@
-         * incident continuum - there are reports of the incident continuum 
-         * striking the cloud and the emergent - incident distinction does
-
+
+
-        if( LineSave.ipass > 0 )
-        {
@@ -258 +256 @@
-        }
-
-
-
-
+
+
+
+
-        linadd(flow,0,"Ba C",'i',
-                "integrated Balmer continuum emission");
-
-
-flow = iso.RadRecomb[ipH_LIKE][ipHYDROGEN][3][ipRecRad]*
+
+       
-          dense.eden*dense.xIonDense[ipHYDROGEN][1]*3.53e-12;
-        linadd(flow,0,"PA C",'i',

trunk/source/rt_line_all.cpp

@@ -346 +346 @@
-                                Transitions[1][1][10][5].Emis.Pesc);*/
-
-l
-l
+L
+L
-        if( !hydro.lgLymanPumping )
-        {

trunk/source/version.h

@@ -23 +23 @@
-        bool lgRelease;
-
-
+
+
-        char chInfo[INPUT_LINE_LENGTH];
-