Changeset 1984

Show
Ignore:
Timestamp:
04/28/08 19:10:44 (2 weeks ago)
Author:
peter
Message:

data/bt94.szd
data/pah1_bt94_01.opc
data/pah1_bt94_10.opc

Renamed to ->

data/ab08.szd
data/pah1_ab08_01.opc
data/pah1_ab08_10.opc

  • Correct erroneous origin of PAH size distribution. The correct reference is
    Abel et al., 2008, ApJ, submitted

source/parse_compile.cpp:
source/parse_grain.cpp:
data/compile1grain.in:

  • Update file names to reflect changes above.
  • Alter keyword BT94 -> AB08 on COMPILE GRAINS command.

data/compilestars.in:

  • Modified title only.

data/compile1star.in:

  • Deleted. This mode of compiling stellar grids is no longer supported
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/data/ab08.szd

    • Property svn:mergeinfo set
    r13 r1984  
    1 # PAH size distribution from Bakes & Tielens, 1994, ApJ, 427, 822 
     1# PAH size distribution from Abel et al., 2008, ApJ, submitted 
    222010403 # magic number for version control 
    33power  # choices are SSIZE, POWER, EXP1, EXP2, EXP3 

  • trunk/data/compile1grain.in

    r13 r1984  
    11title this will compile only one grain species 
    22# this will use default of 10 bins 
    3 #compile only agb-silicate ism grains 
     3#compile agb-silicate ism grains 
    44# this will do 1 large bin 
    5 #compile only agb-silicate ism grains 1 
     5#compile agb-silicate ism grains 1 
    66# this will do 1 large bin for pahs 
    7 compile only pah bt94 grains 1 
     7compile pah ab08 grains 1 

  • trunk/data/compilestars.in

    r13 r1984  
    1 title this compiles all sets of stellar atmosphers 
     1title this compiles the stellar atmosphere grids that you downloaded 
    22compile stars 
    33 

  • trunk/data/pah1_ab08_01.opc

    • Property svn:mergeinfo set
    r13 r1984  
    55     1030103 # magic number rfi/mix file 
    66     2010403 # magic number szd file 
    7  pah1-bt94   # grain type label 
     7 pah1-ab08   # grain type label 
    881.800000e+000 # specific weight (g/cm^3) 
    991.201078e+001 # molecular weight of grain molecule (amu) 

  • trunk/data/pah1_ab08_10.opc

    • Property svn:mergeinfo set
    r13 r1984  
    55     1030103 # magic number rfi/mix file 
    66     2010403 # magic number szd file 
    7  pah-bt94xx  # grain type label, xx will be replaced by bin no. 
     7 pah-ab08xx  # grain type label, xx will be replaced by bin no. 
    881.800000e+000 # specific weight (g/cm^3) 
    991.201078e+001 # molecular weight of grain molecule (amu) 

  • trunk/source/parse_compile.cpp

    r1969 r1984  
    214214                                strcpy(chSZD , "ism.szd" ); 
    215215                        } 
    216                         else if( (ptr = strstr(chCard,"BT94")) != NULL ) 
    217                         { 
    218                                 /* Bakes & Tielens 1994 size distribution */ 
    219                                 strcpy(chSZD , "bt94.szd" ); 
     216                        else if( (ptr = strstr(chCard,"AB08")) != NULL ) 
     217                        { 
     218                                /* Abel et al., 2008 size distribution */ 
     219                                strcpy(chSZD , "ab08.szd" ); 
    220220                                strncpy(ptr,"    ",4); 
    221221                        } 
    …… 
    248248                        fprintf(ioQQQ,"Sorry, but I did not recognize a size distribution file.\n"); 
    249249                        fprintf(ioQQQ,"Supply a file name between quotes or one of the following "); 
    250                         fprintf(ioQQQ,"keywords: 0m010, 0m100, 1m000, ism, orion, on341, 0n682, bt94\n"); 
     250                        fprintf(ioQQQ,"keywords: 0m010, 0m100, 1m000, ism, orion, on341, 0n682, ab08\n"); 
    251251                        cdEXIT(EXIT_FAILURE); 
    252252                } 
    …… 
    310310 
    311311                        /* distributed pah */ 
    312                         mie_write_opc( "pah1.rfi" , "bt94.szd" , 10 ); 
     312                        mie_write_opc( "pah1.rfi" , "ab08.szd" , 10 ); 
    313313 
    314314                        /* single pah */ 
    315                         mie_write_opc( "pah1.rfi" , "bt94.szd" , 1 ); 
     315                        mie_write_opc( "pah1.rfi" , "ab08.szd" , 1 ); 
    316316                } 
    317317                /* this option is to compile a single type of grain */ 

  • trunk/source/parse_grain.cpp

    r1771 r1984  
    256256                                if( lgSizeDistribution ) 
    257257                                { 
    258                                         mie_read_opc("pah1_bt94_10.opc",gp); 
    259                                 } 
    260                                 else 
    261                                 { 
    262                                         mie_read_opc("pah1_bt94_01.opc",gp); 
     258                                        mie_read_opc("pah1_ab08_10.opc",gp); 
     259                                } 
     260                                else 
     261                                { 
     262                                        mie_read_opc("pah1_ab08_01.opc",gp); 
    263263                                } 
    264264                        }