Changeset 2125 for branches/newmole/source/punch_do.cpp

Timestamp:

06/24/08 16:39:58 (7 months ago)

Author:

rjrw

Message:

Merged from trunk r2111:2124

Files:

• branches/newmole/source/punch_do.cpp (modified) (2 diffs)

branches/newmole/source/punch_do.cpp

@@ -453 +453 @@
 
                                                 /* the outward emitted continuum */
-                                                conem = ((rfield.ConEmitOut[j])/
+                                                conem = (rfield.ConEmitOut[j]/
                                                   rfield.widflx[j]*rfield.anu2[j] + punch.PunchLWidth*
                                                   rfield.outlin[j]*rfield.anu[j])*radius.r1r0sq*
@@ -2901 +2901 @@
                                         {
                                                 fprintf( punch.ipPnunit[ipPun], 
-                                                        "%.4e\t%.4e\t%.4e\t%.4e\t%.4e\n", 
-                                                  rfield.anu[j], 
+                                                        "%.4e\t%.4e\t%.4e\t%.4e\t%.4e\t%.4e\n", 
+                                                  AnuUnit(rfield.AnuOrg[j]),
                                                   rfield.ConEmitLocal[nzone][j]/rfield.widflx[j], 
                                                   opac.opacity_abs[j], 
-                                                  rfield.ConEmitLocal[nzone][j]/rfield.widflx[j]/SDIV( opac.opacity_abs[j]), 
-                                                  rfield.ConEmitLocal[nzone][j]/rfield.widflx[j]/SDIV( opac.opacity_abs[j])/plankf(j) );
+                                                  rfield.ConSourceFcnLocal[nzone][j], 
+                                                  rfield.ConSourceFcnLocal[nzone][j]/plankf(j) );
                                         }
                                 }