Changeset 1906

Timestamp:

04/01/08 09:29:16 (9 months ago)

Author:

gary

Message:

cddefines.h atmdat_chianti.cpp - add variable to identify species within state

atmdat_lamda.cpp - remember atomic weight from lamda database

cont_createpointers.cpp - bugfix - save dampXvel rather than damp

prt_lines_continuum.cpp - comments

punch_do.cpp, punch_line.cpp - comments

rt_escprob.cpp - assert damping constant is positive for partial redistribution

rt_tau_inc.cpp - increment database line optical depths

Location:

trunk/source

Files:

• atmdat_chianti.cpp (modified) (1 diff)
• atmdat_lamda.cpp (modified) (4 diffs)
• cddefines.h (modified) (1 diff)
• cont_createpointers.cpp (modified) (1 diff)
• nemala.txt (modified) (1 diff)
• prt_lines_continuum.cpp (modified) (1 diff)
• punch_do.cpp (modified) (1 diff)
• punch_line.cpp (modified) (1 diff)
• rt_escprob.cpp (modified) (1 diff)
• rt_tau_inc.cpp (modified) (1 diff)

trunk/source/atmdat_chianti.cpp

@@ -263 +263 @@
                 strncpy(atmolStates[intNS][j].chLabel,Species[intNS].chptrSpName, 4);
                 atmolStates[intNS][j].chLabel[4] = '\0';
+
+                /*Index for keep track of species index*/
+                atmolStates[intNS][j].AtmolIndex = intNS;
 
                 fstatwt = (realnum)atof(&chLine[SWS]);

trunk/source/atmdat_lamda.cpp

@@ -52 +52 @@
         ipLo = 0;
         j = 0;
-        while(intlnct < 5)
+        while(intlnct < 3)
         {
                 intlnct++;
@@ -61 +61 @@
                 }
         }
-
+        /*Extracting out the molecular weight*/
+        if(read_whole_line( chLine , (int)sizeof(chLine) , atmolLevDATA ) == NULL )
+        {
+                fprintf( ioQQQ, " The data file %s is corrupted .\n",chEFilename);
+                cdEXIT(EXIT_FAILURE);
+        }
+        Species[intNS].fmolweight = (realnum)atof(chLine);
+
+        /*Discard this line*/
+        if(read_whole_line( chLine , (int)sizeof(chLine) , atmolLevDATA ) == NULL )
+        {
+                fprintf( ioQQQ, " The data file %s is corrupted .\n",chEFilename);
+                cdEXIT(EXIT_FAILURE);
+        }
+        /*Reading in the number of energy levels*/
         if(read_whole_line( chLine , (int)sizeof(chLine) , atmolLevDATA ) == NULL )
         {
@@ -127 +141 @@
                 strncpy(atmolStates[intNS][nMolLevs].chLabel,Species[intNS].chptrSpName, 4);
                 atmolStates[intNS][nMolLevs].chLabel[4] = '\0';
+                /*Keeping track of species index*/
+                atmolStates[intNS][nMolLevs].AtmolIndex = intNS;
 
                 long i = 1;
@@ -224 +240 @@
                 /* don't need the energy in GHz, so throw it away. */
                 FFmtRead( chLine, &i, sizeof(chLine), &lgEOL );
-                fenergyK = (realnum)FFmtRead( chLine, &i, sizeof(chLine), &lgEOL );
-
+                fenergyK = (realnum)(((atmolStates[intNS][ipHi].energy) -(atmolStates[intNS][ipLo].energy))*T1CM);
                 ASSERT( index == intrtct + 1 );
 

trunk/source/cddefines.h

@@ -1282 +1282 @@
         char chConfig[11];
 
+        /*Index to identify the quantum state with the species index*/
+        int AtmolIndex;
+
         species   *sp;
 

trunk/source/cont_createpointers.cpp

@@ -604 +604 @@
                 atmolEmis[i].gf = (realnum)GetGF(atmolEmis[i].Aul,
                         atmolEmis[i].tran->EnergyWN,atmolEmis[i].tran->Hi->g);
-                realnum fdampXvel = (realnum)(atmolEmis[i].Aul/
+                atmolEmis[i].dampXvel = (realnum)(atmolEmis[i].Aul/
                                         atmolEmis[i].tran->EnergyWN/PI4);
-                atmolEmis[i].damp = fdampXvel/(realnum)atmolEmis[i].tran->Hi->lifetime ;
+                atmolEmis[i].damp = -1000.0;
+                //atmolEmis[i].damp = fdampXvel/(realnum)atmolEmis[i].tran->Hi->lifetime ;
                 /*Put null terminated line label into chLab*/
                 strncpy(chLab,atmolEmis[i].tran->Hi->chLabel,4);

trunk/source/nemala.txt

@@ -1 @@
-to use the Chianti and Leiden data base files uncomment Nemala_Start at atmdat_readion.cpp near line 1433
+to use the Chianti and Leiden data base files uncomment Nemala_Start at 
+atmdat_readin.cpp near line 1433

trunk/source/prt_lines_continuum.cpp

@@ -304 +304 @@
                         /* div by opac.E2TauAbsFace[i] because ConEmitReflec has already
                          * been corrected for this - emergent_line will introduce a 
-                         * further correction so this will cancil the extra factor */
+                         * further correction so this will cancel the extra factor */
                         double xIntenIn = 
                                 ((double)rfield.ConEmitReflec[i-1]/SDIV((double)opac.E2TauAbsFace[i-1]) + 

trunk/source/punch_do.cpp

@@ -2138 +2138 @@
                         else if( strcmp(punch.chPunch[ipPun],"LINS") == 0 )
                         {
-                                /* punch line structure */
+                                /* punch line emissivity */
                                 if( strcmp(chTime,"LAST") != 0 )
                                 {

trunk/source/punch_line.cpp

@@ -144 +144 @@
         else if( strcmp(chDo,"PUNS") == 0 )
         {
-                /* punch lines structure command */
+                /* punch lines emissivity command */
                 static bool lgMustGetLines=true,
                         lgBadLine=false;

trunk/source/rt_escprob.cpp

@@ -48 +48 @@
 
         DEBUG_ENTRY( "esc_PRD_1side()" );
-
+        ASSERT( a>0.0 );
 
         /* this is one of the three fundamental escape probability routines

trunk/source/rt_tau_inc.cpp

@@ -194 +194 @@
         H2_RT_tau_inc();
 
+        /*Atomic & Molecular Lines*/
+        for(i=0; i < linesAdded2; i++)
+        {
+                RT_line_one_tauinc(atmolEmis[i].tran,
+                        -10 , -10 , -10 , i );
+        }
         /* following is for static atmosphere */
         if( wind.windv == 0. )