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

Merging all changes from mainline upto r2033, except r1902.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/c08_branch/source/hydroeinsta.cpp

    r1732 r2034  
    4848        long ipISO = ipH_LIKE; 
    4949        /* charge to 4th power, needed for scaling laws for As*/ 
    50         double z4 = POW2((double)nelem+1); 
     50        double z4 = POW4((double)nelem+1.); 
    5151        DEBUG_ENTRY( "hydro_transprob()" ); 
    52  
    53         z4 *= z4; 
    5452 
    5553        if( ipHi >= iso.numLevels_max[ipISO][nelem]-iso.nCollapsed_max[ipISO][nelem] ) 
     
    6967                        Aul = H_Einstein_A( N_(ipHi), L_(ipLo)+1, N_(ipLo), L_(ipLo), nelem+1 ); 
    7068 
     69                        iso.CachedAs[ipISO][nelem][ N_(ipHi)-iso.n_HighestResolved_max[ipISO][nelem]-1 ][ ipLo ][0] = (realnum)Aul; 
     70 
    7171                        Aul *= (2.*L_(ipLo)+3.) * 2. / (2.*(double)N_(ipHi)*(double)N_(ipHi)); 
    7272 
     
    7676                                Aul1 = H_Einstein_A( N_(ipHi), L_(ipLo)-1, N_(ipLo), L_(ipLo), nelem+1 ); 
    7777 
     78                                iso.CachedAs[ipISO][nelem][ N_(ipHi)-iso.n_HighestResolved_max[ipISO][nelem]-1 ][ ipLo ][1] = (realnum)Aul1; 
     79 
    7880                                /* now add in this part after multiplying by stat weight for lHi = lLo-1.       */ 
    7981                                Aul += Aul1*(2.*L_(ipLo)-1.) * 2. / (2.*(double)N_(ipHi)*(double)N_(ipHi)); 
    8082                        } 
     83                        else 
     84                                iso.CachedAs[ipISO][nelem][ N_(ipHi)-iso.n_HighestResolved_max[ipISO][nelem]-1 ][ ipLo ][1] = 0.f; 
     85 
    8186                        iso_put_error(ipISO,nelem,ipHi,ipLo,IPRAD,0.01f); 
    8287                        ASSERT( Aul > 0.);