Commit b30464dbd6c9917119fa1466dab0661e15d78d55
1 parent
7236349e
Exists in
master
tidied inline help and comments
Showing
1 changed file
with
4 additions
and
10 deletions
Show diff stats
src/idl/dustem_read_all.pro
@@ -10,7 +10,8 @@ FUNCTION dustem_read_all,dir_in,silent=silent,help=help | @@ -10,7 +10,8 @@ FUNCTION dustem_read_all,dir_in,silent=silent,help=help | ||
10 | ; CALLING SEQUENCE: | 10 | ; CALLING SEQUENCE: |
11 | ; st=dustem_read_all(dir_in,silent=silent,help=help) | 11 | ; st=dustem_read_all(dir_in,silent=silent,help=help) |
12 | ; INPUTS: | 12 | ; INPUTS: |
13 | -; dir_in: input directory | 13 | +; dir_in: directory containing .DAT files to describe grain |
14 | +; population properties | ||
14 | ; OPTIONAL INPUT PARAMETERS: | 15 | ; OPTIONAL INPUT PARAMETERS: |
15 | ; None | 16 | ; None |
16 | ; OUTPUTS: | 17 | ; OUTPUTS: |
@@ -51,13 +52,13 @@ IF !dustem_which EQ 'WEB3p8' or !dustem_which EQ 'RELEASE' THEN BEGIN | @@ -51,13 +52,13 @@ IF !dustem_which EQ 'WEB3p8' or !dustem_which EQ 'RELEASE' THEN BEGIN | ||
51 | goto, the_end | 52 | goto, the_end |
52 | ENDIF | 53 | ENDIF |
53 | 54 | ||
54 | -;== IAS VERSION -- TO BE DEPRECATED IN FUTURE DISTRIB | 55 | +;== IAS VERSION -- TO BE DEPRECATED IN FUTURE DISTRIBS |
55 | IF !dustem_which EQ 'VERSTRAETE' THEN BEGIN | 56 | IF !dustem_which EQ 'VERSTRAETE' THEN BEGIN |
56 | st=dustem_read_all_lv(dir_in,silent=silent) | 57 | st=dustem_read_all_lv(dir_in,silent=silent) |
57 | goto,ionfrac | 58 | goto,ionfrac |
58 | ENDIF | 59 | ENDIF |
59 | 60 | ||
60 | -;== IRAP/IPAG VERSIONS -- TO BE DEPRECATED IN FUTURE DISTRIB | 61 | +;== IRAP/IPAG VERSIONS -- TO BE DEPRECATED IN FUTURE DISTRIBS |
61 | ;== note: the output keywords are set only for LV version | 62 | ;== note: the output keywords are set only for LV version |
62 | file=dir_in+'GRAIN.DAT' | 63 | file=dir_in+'GRAIN.DAT' |
63 | st_grains=dustem_read_grain(file,silent=silent) | 64 | st_grains=dustem_read_grain(file,silent=silent) |
@@ -131,12 +132,6 @@ IF !dustem_which EQ 'COMPIEGNE' THEN BEGIN | @@ -131,12 +132,6 @@ IF !dustem_which EQ 'COMPIEGNE' THEN BEGIN | ||
131 | st={Ngrains:Ngrains,grains:sst_grains, $ | 132 | st={Ngrains:Ngrains,grains:sst_grains, $ |
132 | isrf:st_isrf,qabs:st_qabs,calor:st_calor,specem:st_specem,lambda:st_lambda} | 133 | isrf:st_isrf,qabs:st_qabs,calor:st_calor,specem:st_specem,lambda:st_lambda} |
133 | ENDIF | 134 | ENDIF |
134 | -; according to logic, should will never reach these lines | ||
135 | -;IF !dustem_which EQ 'VERSTRAETE' THEN BEGIN | ||
136 | -; | ||
137 | -;st={Ngrains:Ngrains,grains:sst_grains, $ | ||
138 | -; isrf:st_isrf,qabs:st_qabs,calor:st_calor,specem:st_specem,lambda:st_lambda} | ||
139 | -;ENDIF | ||
140 | 135 | ||
141 | ionfrac: | 136 | ionfrac: |
142 | IF !dustem_which EQ 'VERSTRAETE' THEN BEGIN | 137 | IF !dustem_which EQ 'VERSTRAETE' THEN BEGIN |
@@ -238,7 +233,6 @@ IF !dustem_which EQ 'VERSTRAETE' THEN BEGIN | @@ -238,7 +233,6 @@ IF !dustem_which EQ 'VERSTRAETE' THEN BEGIN | ||
238 | ;JPB: The above is stupid, especially before I added the !dustem_verbose test | 233 | ;JPB: The above is stupid, especially before I added the !dustem_verbose test |
239 | ENDIF | 234 | ENDIF |
240 | 235 | ||
241 | - | ||
242 | the_end: | 236 | the_end: |
243 | RETURN,st | 237 | RETURN,st |
244 | 238 |