Science/cloudy-agn
1
0
Fork 0
mirror of https://asciireactor.com/otho/cloudy-agn.git synced 2024-12-05 02:25:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
caes 2017-07-04 05:10:32 -04:00
parent c2bfaf4f10
commit fbbe5dae46
3 changed files with 61392 additions and 60284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121649
reference/line_labels
View File

File diff suppressed because it is too large Load Diff

24
src/agn.hpp
View File

@ -383,6 +383,13 @@ agn::cloudy_grid agn::read_cloudy_grid(std::ifstream& inputfile) {
newlabel << " j=" << j; newlabel << " j=" << j;
if(point.intrinsic_line_intensity.count(newlabel.str()) != 0) { if(point.intrinsic_line_intensity.count(newlabel.str()) != 0) {
j++; j++;
// RED ALERT
// To ease work in summer 2017, this line sets the
// final instance of the emission line value
// to the original label, this was to get around
// the 3645.00A and 3647.00A being reported with
// different values in c17 version 1
point.intrinsic_line_intensity[label] = data;
continue; continue;
} }
else { else {
@ -393,11 +400,12 @@ agn::cloudy_grid agn::read_cloudy_grid(std::ifstream& inputfile) {
} }
linetext_it++; linetext_it++;
} }
if(agn::debug) { if(agn::debug) std::cout << " Duplicates found: " << duplicate_labels.size();
std::cout << " Duplicates found: "; if(agn::line_debug) {
std::list<std::string>::iterator dup_it = duplicate_labels.begin(); std::list<std::string>::iterator dup_it = duplicate_labels.begin();
while (dup_it != duplicate_labels.end() ) { while (dup_it != duplicate_labels.end() ) {
std::cout << *dup_it << " "; std::cout << std::endl;
std::cout << *dup_it;
dup_it++; dup_it++;
} }
std::cout << " Grabbing footer."; std::cout << " Grabbing footer.";
@ -423,16 +431,6 @@ agn::cloudy_grid agn::read_cloudy_grid(std::ifstream& inputfile) {
<< std::endl; << std::endl;
grid[*coords] = point; grid[*coords] = point;
coords++; coords++;
//if(agn::debug) std::cout << "yo!";
//std::cout << "bye" << coords->first;
//if(agn::debug) std::cout
// << std::setprecision(2)
// << "Moving to "
// << coords->first
// << "x"
// << coords->second
// << " me?"
// << std::endl;
} }
if(agn::debug) std::cout if(agn::debug) std::cout

3
src/spectral_lines.hpp
View File

@ -268,6 +268,9 @@ std::list<agn::eqwidth_table> agn::compile_eqwidth_tables(agn::cloudy_grid grid,
if ( data.has_duplicates ) { if ( data.has_duplicates ) {
// This needs to be expanded to catch all duplicate values j=1,2,etc. // This needs to be expanded to catch all duplicate values j=1,2,etc.
// For now, just blindly use the value the program finds... // For now, just blindly use the value the program finds...
// the functionality is written in the agn.hpp sections, but is not
// implemented here, and as of 2017, the agn.hpp function writes the
// last-encountered instance of the emission line value to the label
} }
} }
if ( data.radiated_energy < EQWIDTH_MIN_VAL_LOG || data.eq_width < EQWIDTH_MIN_VAL) { if ( data.radiated_energy < EQWIDTH_MIN_VAL_LOG || data.eq_width < EQWIDTH_MIN_VAL) {