Show
Ignore:
Timestamp:
05/10/08 09:03:02 (6 months ago)
Author:
peter
Message:

Merging all changes from mainline upto r2033, except r1902.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • branches/c08_branch/source/cont_createpointers.cpp

    r1815 r2034  
    604604                atmolEmis[i].gf = (realnum)GetGF(atmolEmis[i].Aul, 
    605605                        atmolEmis[i].tran->EnergyWN,atmolEmis[i].tran->Hi->g); 
    606                 realnum fdampXvel = (realnum)(atmolEmis[i].Aul/ 
     606                atmolEmis[i].dampXvel = (realnum)(atmolEmis[i].Aul/ 
    607607                                        atmolEmis[i].tran->EnergyWN/PI4); 
    608                 atmolEmis[i].damp = fdampXvel/(realnum)atmolEmis[i].tran->Hi->lifetime ; 
     608                atmolEmis[i].damp = -1000.0; 
    609609                /*Put null terminated line label into chLab*/ 
    610610                strncpy(chLab,atmolEmis[i].tran->Hi->chLabel,4);