OV-GSO-DC / dustem-wrapper_idl

Commit 3c33391b22290c2395cfa2a06512994eb57a0456

Authored by Annie Hughes
1 parent ed96a6b1
Exists in master

modifs for K15 and Y19 aggregates

Showing 3 changed files with 57 additions and 3 deletions   Show diff stats
Inline Side-by-side
src/idl/dustem_init.pro
  Diff comments   View file @3c33391
... ... @@ -382,6 +382,15 @@ CASE use_model OF
382 382 'AJ13':BEGIN ; for backwards compatibility
383 383 (*!dustem_inputs).grain='GRAIN_J13.DAT'
384 384 END
  385 + 'K15_AMMI':BEGIN
  386 + (*!dustem_inputs).grain='GRAIN_AMMI_K15.DAT'
  387 + END
  388 + 'K15_AMMK':BEGIN
  389 + (*!dustem_inputs).grain='GRAIN_AMMk_K15.DAT'
  390 + END
  391 + 'K15_CMM':BEGIN
  392 + (*!dustem_inputs).grain='GRAIN_CMM_K15.DAT'
  393 + END
385 394 'G17_MODELA':BEGIN
386 395 (*!dustem_inputs).grain='GRAIN_G17_ModelA.DAT'
387 396 (*!dustem_inputs).align='ALIGN_G17_ModelA.DAT'
... ... @@ -398,6 +407,33 @@ CASE use_model OF
398 407 (*!dustem_inputs).grain='GRAIN_G17_ModelD.DAT'
399 408 (*!dustem_inputs).align='ALIGN_G17_ModelD.DAT'
400 409 END
  410 + 'Y19_TYP1':BEGIN
  411 + (*!dustem_inputs).grain='GRAIN_typ1_Y19.DAT'
  412 + END
  413 + 'Y19_TYP2':BEGIN
  414 + (*!dustem_inputs).grain='GRAIN_typ2_Y19.DAT'
  415 + END
  416 + 'Y19_TYP3':BEGIN
  417 + (*!dustem_inputs).grain='GRAIN_typ3_Y19.DAT'
  418 + END
  419 + 'Y19_TYP4':BEGIN
  420 + (*!dustem_inputs).grain='GRAIN_typ4_Y19.DAT'
  421 + END
  422 + 'Y19_TYP5':BEGIN
  423 + (*!dustem_inputs).grain='GRAIN_typ5_Y19.DAT'
  424 + END
  425 + 'Y19_TYP6':BEGIN
  426 + (*!dustem_inputs).grain='GRAIN_typ6_Y19.DAT'
  427 + END
  428 + 'Y19_TYP7':BEGIN
  429 + (*!dustem_inputs).grain='GRAIN_typ7_Y19.DAT'
  430 + END
  431 + 'Y19_TYP8':BEGIN
  432 + (*!dustem_inputs).grain='GRAIN_typ8_Y19.DAT'
  433 + END
  434 + 'Y19_TYP9':BEGIN
  435 + (*!dustem_inputs).grain='GRAIN_typ9_Y19.DAT'
  436 + END
401 437 'Y24':BEGIN
402 438 (*!dustem_inputs).grain='GRAIN_Y24.DAT'
403 439 (*!dustem_inputs).align='ALIGN_Y24.DAT'
... ... @@ -556,7 +592,9 @@ IF keyword_set(wraptest) THEN BEGIN
556 592 xtit=textoidl('\lambda (\mum)')
557 593 ytit=textoidl('\nuI_\nu^{em} (W/m^2/sr for N_H=1.e20 H/cm^2)')
558 594 yr=[1e-11,6.e-7]
559   - xr=[1,5e3]
  595 + ;yr=[1e-21,6.e-7] ; needed for aggregates
  596 + xr=[1,5.e3]
  597 + ;xr=[1,500.e3] ; needed for aggregates
560 598 dustem_plot_nuinu_em,st,yr=yr,/ysty,xr=xr,/xsty,/xlog,/ylog,title=tit,xtit=xtit,ytit=ytit
561 599 ENDIF
562 600  
... ...
src/idl/dustem_read_qabs_lv.pro
  Diff comments   View file @3c33391
1   -FUNCTION dustem_read_qabs_lv,file,silent=silent,read_densities=read_densities
  1 +FUNCTION dustem_read_qabs_lv,file,silent=silent,read_densities=read_densities $
  2 + ,qabs_values=qabs_values $
  3 + ,qsca_values=qsca_values
2 4  
3 5 ;+
4 6 ; NAME:
... ... @@ -23,7 +25,9 @@ FUNCTION dustem_read_qabs_lv,file,silent=silent,read_densities=read_densities
23 25 ; st : dustem data structure
24 26 ;
25 27 ; OPTIONAL OUTPUT PARAMETERS:
26   -;
  28 +; qabs_values : values of qabs read from file [Nsize x Nwav]
  29 +; qsca_values : values of qsca read from file [Nsize x Nwav]
  30 +;
27 31 ; ACCEPTED KEY-WORDS:
28 32 ; read_densities : if grain densities are size-dependent they should be
29 33 ; read here
... ...
src/idl/dustem_test_model_exists.pro
  Diff comments   View file @3c33391
... ... @@ -74,12 +74,24 @@ function dustem_test_model_exists,model $
74 74 ,'DL07' $
75 75 ,'J13' $
76 76 ,'AJ13' $ ; for backwards compatibility = J13
  77 + ,'K15_AMMI' $
  78 + ,'K15_AMMK' $
  79 + ,'K15_CMM' $
77 80 ,'G17_MODELA' $
78 81 ,'G17_MODELB' $
79 82 ,'G17_MODELC' $
80 83 ,'G17_MODELD' $
81 84 ,'THEMIS' $ ; for convenience = J13
82 85 ,'THEMIS2' $ ; for convenience = Y24
  86 + ,'Y19_TYP1' $
  87 + ,'Y19_TYP2' $
  88 + ,'Y19_TYP3' $
  89 + ,'Y19_TYP4' $
  90 + ,'Y19_TYP5' $
  91 + ,'Y19_TYP6' $
  92 + ,'Y19_TYP7' $
  93 + ,'Y19_TYP8' $
  94 + ,'Y19_TYP9' $
83 95 ,'Y24' $
84 96 ,'HD22' $
85 97 ,'ASTRODUST' $ ; for convience = HD22
... ...