OV-GSO-DC / dustem-wrapper_idl

Commit a8bf7c1c02fbbf5cf9befb07d1ce7c238932c220

Authored by Annie Hughes
1 parent d0eb81ec
Exists in master

minor changes

Showing 3 changed files with 79 additions and 71 deletions   Show diff stats
Inline Side-by-side
src/idl/dustem_save_system_variables.pro
  Diff comments   View file @a8bf7c1
@@ -3,44 +3,52 @@ PRO dustem_save_system_variables,file,help=help @@ -3,44 +3,52 @@ PRO dustem_save_system_variables,file,help=help
3 ;+ 3 ;+
4 ; NAME: 4 ; NAME:
5 ; dustem_save_system_variables 5 ; dustem_save_system_variables
  6 +;
6 ; PURPOSE: 7 ; PURPOSE:
7 -; Save Dustem system variables a file 8 +; Save DustEMWrap system variables a file
  9 +;
8 ; CATEGORY: 10 ; CATEGORY:
9 -; Dustem 11 +; DustEMWrap, Distributed, LowLevel, Initialization
  12 +;
10 ; CALLING SEQUENCE: 13 ; CALLING SEQUENCE:
11 ; dustem_save_system_variables,file[,/help] 14 ; dustem_save_system_variables,file[,/help]
  15 +;
12 ; INPUTS: 16 ; INPUTS:
13 -; file = File name 17 +; file = output file to be written
  18 +;
14 ; OPTIONAL INPUT PARAMETERS: 19 ; OPTIONAL INPUT PARAMETERS:
15 ; None 20 ; None
  21 +;
16 ; OUTPUTS: 22 ; OUTPUTS:
17 ; None 23 ; None
  24 +;
18 ; OPTIONAL OUTPUT PARAMETERS: 25 ; OPTIONAL OUTPUT PARAMETERS:
19 ; None 26 ; None
  27 +;
20 ; ACCEPTED KEY-WORDS: 28 ; ACCEPTED KEY-WORDS:
21 ; help = If set, print this help 29 ; help = If set, print this help
  30 +;
22 ; COMMON BLOCKS: 31 ; COMMON BLOCKS:
23 ; None 32 ; None
  33 +;
24 ; SIDE EFFECTS: 34 ; SIDE EFFECTS:
25 -; File is stored.  
26 -; The following system variables are stored:  
27 -; !dustem_fit  
28 -; !dustem_data  
29 -; !dustem_filters  
30 -; !run_ionfrac  
31 -; !dustem_verbose 35 +; File containing system variables is written.
  36 +;
32 ; RESTRICTIONS: 37 ; RESTRICTIONS:
33 -; The dustem idl wrapper must be installed  
34 -; PROCEDURE:  
35 -; None  
36 -; EXAMPLES  
37 -; 38 +; The DustEM fortran code must be installed
  39 +; The DustEMWrap IDL code must be installed
  40 +;
  41 +; PROCEDURES AND SUBROUTINES USED:
  42 +;
  43 +; EXAMPLES:
  44 +;
38 ; MODIFICATION HISTORY: 45 ; MODIFICATION HISTORY:
39 -; Written by J.-Ph. Bernard  
40 -; see evolution details on the dustem cvs maintained at CESR  
41 -; Contact J.-Ph. Bernard (Jean-Philippe.Bernard@cesr.fr) in case of problems. 46 +; Written by JPB
  47 +; Evolution details on the DustEMWrap gitlab.
  48 +; See http://dustemwrap.irap.omp.eu/ for FAQ and help.
42 ;- 49 ;-
43 50
  51 +
44 ; !DUSTEM_DAT = '/tmp/ramdisk8MB/' 52 ; !DUSTEM_DAT = '/tmp/ramdisk8MB/'
45 ; !DUSTEM_DATA = -> <Anonymous> Array[1] 53 ; !DUSTEM_DATA = -> <Anonymous> Array[1]
46 ; !DUSTEM_DO_CC = 1 54 ; !DUSTEM_DO_CC = 1
@@ -79,7 +87,7 @@ IF keyword_set(help) THEN BEGIN @@ -79,7 +87,7 @@ IF keyword_set(help) THEN BEGIN
79 ENDIF 87 ENDIF
80 88
81 saved_dustem_dat=!dustem_dat 89 saved_dustem_dat=!dustem_dat
82 -saved_dustem_data=!dustem_data 90 +saved_dustem_data=!dustem_data ; observaitonal data
83 saved_dustem_show=!dustem_show 91 saved_dustem_show=!dustem_show
84 saved_dustem_do_cc=!DUSTEM_DO_CC 92 saved_dustem_do_cc=!DUSTEM_DO_CC
85 saved_dustem_f90_exec=!DUSTEM_F90_EXEC 93 saved_dustem_f90_exec=!DUSTEM_F90_EXEC
@@ -111,40 +119,38 @@ saved_DUSTEM_REDSHIFT=!DUSTEM_REDSHIFT @@ -111,40 +119,38 @@ saved_DUSTEM_REDSHIFT=!DUSTEM_REDSHIFT
111 saved_DUSTEM_PLUGIN=!DUSTEM_PLUGIN 119 saved_DUSTEM_PLUGIN=!DUSTEM_PLUGIN
112 120
113 save,saved_dustem_dat,$ 121 save,saved_dustem_dat,$
114 - saved_dustem_data, $  
115 - saved_dustem_show, $  
116 - saved_dustem_fit, $  
117 - saved_dustem_do_cc, $  
118 - saved_dustem_f90_exec, $  
119 - saved_dustem_filters, $  
120 - saved_dustem_fit, $  
121 - saved_dustem_f_hi, $  
122 - saved_DUSTEM_INPUTS, $  
123 - saved_DUSTEM_INSTRUMENT_DESCRIPTION, $  
124 - saved_DUSTEM_NEVER_DO_CC, $  
125 - saved_DUSTEM_PARAMS, $  
126 - saved_DUSTEM_PARINFO, $  
127 - saved_DUSTEM_PREVIOUS_CC, $  
128 - saved_DUSTEM_RES, $  
129 - saved_DUSTEM_SHOW_PLOT, $  
130 - saved_DUSTEM_SOFT_DIR, $  
131 - saved_DUSTEM_VERBOSE, $  
132 - saved_DUSTEM_WHICH, $  
133 - saved_DUSTEM_WRAP_SOFT_DIR, $  
134 - saved_FIT_RCHI2_WEIGHT, $  
135 - saved_RUN_ANIS, $  
136 - saved_RUN_CIRC, $  
137 - saved_RUN_IONFRAC, $  
138 - saved_RUN_LIN, $  
139 - saved_RUN_POL, $  
140 - saved_RUN_RRF, $  
141 - saved_RUN_TLS, $  
142 - saved_RUN_UNIV, $  
143 - saved_DUSTEM_REDSHIFT, $  
144 - saved_DUSTEM_PLUGIN, $  
145 -  
146 - file=file 122 + saved_dustem_data, $
  123 + saved_dustem_show, $
  124 + saved_dustem_fit, $
  125 + saved_dustem_do_cc, $
  126 + saved_dustem_f90_exec, $
  127 + saved_dustem_filters, $
  128 + saved_dustem_fit, $
  129 + saved_dustem_f_hi, $
  130 + saved_DUSTEM_INPUTS, $
  131 + saved_DUSTEM_INSTRUMENT_DESCRIPTION, $
  132 + saved_DUSTEM_NEVER_DO_CC, $
  133 + saved_DUSTEM_PARAMS, $
  134 + saved_DUSTEM_PARINFO, $
  135 + saved_DUSTEM_PREVIOUS_CC, $
  136 + saved_DUSTEM_RES, $
  137 + saved_DUSTEM_SHOW_PLOT, $
  138 + saved_DUSTEM_SOFT_DIR, $
  139 + saved_DUSTEM_VERBOSE, $
  140 + saved_DUSTEM_WHICH, $
  141 + saved_DUSTEM_WRAP_SOFT_DIR, $
  142 + saved_FIT_RCHI2_WEIGHT, $
  143 + saved_RUN_ANIS, $
  144 + saved_RUN_CIRC, $
  145 + saved_RUN_IONFRAC, $
  146 + saved_RUN_LIN, $
  147 + saved_RUN_POL, $
  148 + saved_RUN_RRF, $
  149 + saved_RUN_TLS, $
  150 + saved_RUN_UNIV, $
  151 + saved_DUSTEM_REDSHIFT, $
  152 + saved_DUSTEM_PLUGIN, $
  153 + file=file
147 154
148 the_end: 155 the_end:
149 -  
150 END 156 END
src/idl/dustem_write_grain_release.pro
  Diff comments   View file @a8bf7c1
@@ -98,24 +98,26 @@ printf,unit,(*!dustem_params).G0 @@ -98,24 +98,26 @@ printf,unit,(*!dustem_params).G0
98 frmt='(A25,I4,A20,11E14.6)' 98 frmt='(A25,I4,A20,11E14.6)'
99 ;frmt='(A30,I4,A25,11E14.6)' 99 ;frmt='(A30,I4,A25,11E14.6)'
100 100
  101 +;stop
  102 +
101 FOR i=0L,(*!dustem_params).ngrains-1 DO BEGIN 103 FOR i=0L,(*!dustem_params).ngrains-1 DO BEGIN
102 - printf,unit,st(i).grain_type, $  
103 - st(i).nsize, $  
104 - st(i).type_keywords, $  
105 - st(i).mdust_o_mh, $  
106 - st(i).rho, $  
107 - st(i).amin, $  
108 - st(i).amax, $  
109 - st(i).alpha_o_a0, $  
110 - st(i).at, $  
111 - st(i).ac, $  
112 - st(i).gamma, $  
113 - st(i).au, $  
114 - st(i).zeta, $  
115 - st(i).eta, $  
116 - format=frmt  
117 - IF !dustem_verbose EQ 1 THEN BEGIN  
118 -; stop 104 + printf,unit,st(i).grain_type, $
  105 + st(i).nsize, $
  106 + st(i).type_keywords, $
  107 + st(i).mdust_o_mh, $
  108 + st(i).rho, $
  109 + st(i).amin, $
  110 + st(i).amax, $
  111 + st(i).alpha_o_a0, $
  112 + st(i).at, $
  113 + st(i).ac, $
  114 + st(i).gamma, $
  115 + st(i).au, $
  116 + st(i).zeta, $
  117 + st(i).eta, $
  118 + format=frmt
  119 + IF !dustem_verbose EQ 1 THEN BEGIN
  120 + ;stop
119 print,st(i).grain_type,st(i).nsize,st(i).type_keywords,st(i).mdust_o_mh,st(i).rho,st(i).amin,st(i).amax, $ 121 print,st(i).grain_type,st(i).nsize,st(i).type_keywords,st(i).mdust_o_mh,st(i).rho,st(i).amin,st(i).amax, $
120 st(i).alpha_o_a0, st(i).at,st(i).ac,st(i).gamma,st(i).au,st(i).zeta,st(i).eta,format=frmt 122 st(i).alpha_o_a0, st(i).at,st(i).ac,st(i).gamma,st(i).au,st(i).zeta,st(i).eta,format=frmt
121 ENDIF 123 ENDIF
src/idl_extern/JPBLib_for_Dustemwrap/General/range_gen.pro
  Diff comments   View file @a8bf7c1
@@ -35,7 +35,7 @@ ENDIF @@ -35,7 +35,7 @@ ENDIF
35 IF keyword_set(log) THEN BEGIN 35 IF keyword_set(log) THEN BEGIN
36 ; vec=findgen(Nv)/(1.*Nv-1)*(max(alog10(range))-min(alog10(range)))+min(alog10(range)) 36 ; vec=findgen(Nv)/(1.*Nv-1)*(max(alog10(range))-min(alog10(range)))+min(alog10(range))
37 ;vec=findgen(Nv)/(1.*Nv-1)*(alog10(range(1))-alog10(range(1)))+alog10(range(0)) 37 ;vec=findgen(Nv)/(1.*Nv-1)*(alog10(range(1))-alog10(range(1)))+alog10(range(0))
38 - vec=dindgen(Nv)/(1.*Nv-1)*(alog10(range(1))-alog10(range(1)))+alog10(range(0)) 38 + vec=dindgen(Nv)/(1.*Nv-1)*(alog10(range[1])-alog10(range[0]))+alog10(range[0])
39 vec=10.^vec 39 vec=10.^vec
40 ENDIF ELSE BEGIN 40 ENDIF ELSE BEGIN
41 ; vec=findgen(Nv)/(1.*Nv-1)*(max(range)-min(range))+min(range) 41 ; vec=findgen(Nv)/(1.*Nv-1)*(max(range)-min(range))+min(range)