Skip to content

Commit b9e61d0

Browse files
simon-m-muddsimon-m-mudd
committed
Updating source code to latest version
1 parent 2ed75df commit b9e61d0

26 files changed

+13800
-2800
lines changed

‎src/LSDCRNParameters.cpp

+61
Original file line numberDiff line numberDiff line change
@@ -1144,6 +1144,67 @@ void LSDCRNParameters::set_Braucher_parameters()
11441144
}
11451145
//=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
11461146

1147+
//=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
1148+
// 10Be production is based on a combination of data from Braucher et al 2011
1149+
// and Borchers et al 2016 as transcribed by Mirjam Schaller
1150+
//=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
1151+
void LSDCRNParameters::set_BraucherBorchers_parameters()
1152+
{
1153+
//S_t = 1;
1154+
1155+
// from Vermeesh 2007
1156+
// 10Be from Chmeleff/Korschinek 10Be decay constant;
1157+
lambda_10Be = 500e-9; // in yr-1
1158+
lambda_26Al = 980e-9; // in yr-1
1159+
lambda_14C = 121e-6; // in yr-1
1160+
lambda_36Cl = 230e-8; // in yr-1
1161+
1162+
// from the Braucher and Borchers papers
1163+
// data compiled by Mirjam Schaller in personal communication
1164+
//
1165+
// All but 10Be are calibrated to the Stone scaling
1166+
// Also linked to the nishizumii standards
1167+
P0_10Be = 4.061; // in a/g/yr
1168+
P0_26Al = 28.851; // in a/g/yr
1169+
P0_14C = 15.21; // in a/g/yr
1170+
P0_36Cl = 58.95; // in a/g/yr
1171+
P0_21Ne = 18.23; // in a/g/yr
1172+
P0_3He = 121.59; // in a/g/yr
1173+
1174+
// in g/cm^2
1175+
Gamma[0] = 160;
1176+
Gamma[1] = 1500;
1177+
Gamma[2] = 1500;
1178+
Gamma[3] = 4320;
1179+
1180+
// dimensionless
1181+
F_10Be[0] = 0.9874;
1182+
F_10Be[1] = 0.0030;
1183+
F_10Be[2] = 0.0;
1184+
F_10Be[3] = 0.0096;
1185+
1186+
// dimensionless
1187+
F_26Al[0] = 0.9681;
1188+
F_26Al[1] = 0.0291;
1189+
F_26Al[2] = 0.000;
1190+
F_26Al[3] = 0.0028;
1191+
1192+
// dimensionless
1193+
F_14C[0] = 0.83;
1194+
F_14C[1] = 0.15;
1195+
F_14C[2] = 0.0;
1196+
F_14C[3] = 0.02;
1197+
1198+
// dimensionless
1199+
F_36Cl[0] = 0.9456;
1200+
F_36Cl[1] = 0.0324;
1201+
F_36Cl[2] = 0.00;
1202+
F_36Cl[3] = 0.022;
1203+
}
1204+
//=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
1205+
1206+
1207+
11471208
//=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
11481209
// 10Be is set to a new production curve provided by Shasta Marrero
11491210
// All others: sets the parameters to those used by Braucher et al 2009

‎src/LSDCRNParameters.hpp

+8-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,14 @@ class LSDCRNParameters
217217
/// @author SMM
218218
/// @date 27/01/2015
219219
void set_Braucher_parameters();
220-
220+
221+
/// @brief This resets the F, Gamma and P0 values so that they conform to
222+
/// parameters from Braucher et al 2011 and Brchers et al 2016
223+
/// @detail From personal communication with Mirjam Schaller
224+
/// @author SMM
225+
/// @date 04/02/2022
226+
void set_BraucherBorchers_parameters();
227+
221228
/// @brief This resets the F, Gamma and P0 values
222229
/// For 10Be, these correspond to new production curves provided by Shasta Marerro
223230
// For the rest they conform to

‎src/LSDChiTools.cpp

+144-4
Original file line numberDiff line numberDiff line change
@@ -11879,6 +11879,139 @@ void LSDChiTools::print_chi_data_map_to_csv(LSDFlowInfo& FlowInfo, string filena
1187911879
}
1188011880
//=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
1188111881

11882+
11883+
void LSDChiTools::print_chi_data_map_to_csv_with_ni(LSDFlowInfo& FlowInfo, string filename)
11884+
{
11885+
11886+
// these are for extracting element-wise data from the channel profiles.
11887+
int this_node, row,col;
11888+
double latitude,longitude;
11889+
LSDCoordinateConverterLLandUTM Converter;
11890+
11891+
// find the number of nodes
11892+
int n_nodes = (node_sequence.size());
11893+
11894+
// open the data file
11895+
ofstream chi_data_out;
11896+
chi_data_out.open(filename.c_str());
11897+
chi_data_out << "latitude,longitude,NI,chi,elevation,flow_distance,drainage_area,source_key,basin_key" << endl;
11898+
if (n_nodes <= 0)
11899+
{
11900+
cout << "Cannot print since you have not calculated channel properties yet." << endl;
11901+
}
11902+
else
11903+
{
11904+
for (int n = 0; n< n_nodes; n++)
11905+
{
11906+
this_node = node_sequence[n];
11907+
FlowInfo.retrieve_current_row_and_col(this_node,row,col);
11908+
get_lat_and_long_locations(row, col, latitude, longitude, Converter);
11909+
11910+
chi_data_out.precision(9);
11911+
chi_data_out << latitude << ","
11912+
<< longitude << ","
11913+
<< this_node << ",";
11914+
chi_data_out.precision(5);
11915+
chi_data_out << chi_data_map[this_node] << ","
11916+
<< elev_data_map[this_node] << ","
11917+
<< flow_distance_data_map[this_node] << ","
11918+
<< drainage_area_data_map[this_node] << ","
11919+
<< source_keys_map[this_node] << ","
11920+
<< baselevel_keys_map[this_node];
11921+
11922+
chi_data_out << endl;
11923+
}
11924+
}
11925+
11926+
chi_data_out.close();
11927+
11928+
}
11929+
//=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
11930+
11931+
11932+
void LSDChiTools::print_chi_data_map_to_csv_with_junction_information(LSDFlowInfo& FlowInfo, LSDJunctionNetwork& JN, string filename)
11933+
{
11934+
11935+
// these are for extracting element-wise data from the channel profiles.
11936+
int this_node, row,col;
11937+
double latitude,longitude;
11938+
LSDCoordinateConverterLLandUTM Converter;
11939+
11940+
// find the number of nodes
11941+
int n_nodes = (node_sequence.size());
11942+
11943+
11944+
// Get vectors for making the maps
11945+
vector<int> NIvec;
11946+
vector<int> SOvec;
11947+
vector<int> JIvec;
11948+
JN.GetChannelNodesAndJunctions(FlowInfo, NIvec, JIvec, SOvec);
11949+
11950+
// Turn these into maps
11951+
map<int,int> SO_map;
11952+
map<int,int> JI_map;
11953+
11954+
int n_NI = int(NIvec.size());
11955+
for(int i = 0; i<n_NI; i++)
11956+
{
11957+
SO_map[ NIvec[i] ] = SOvec[i];
11958+
JI_map[ NIvec[i] ] = JIvec[i];
11959+
}
11960+
11961+
// open the data file
11962+
int RJ,UJ,receiver_NI,SO;
11963+
ofstream chi_data_out;
11964+
chi_data_out.open(filename.c_str());
11965+
chi_data_out << "latitude,longitude,NI,receiver_NI,chi,elevation,flow_distance,drainage_area,source_key,basin_key,stream_order,receiver_junction,upstream_junction" << endl;
11966+
if (n_nodes <= 0)
11967+
{
11968+
cout << "Cannot print since you have not calculated channel properties yet." << endl;
11969+
}
11970+
else
11971+
{
11972+
for (int n = 0; n< n_nodes; n++)
11973+
{
11974+
this_node = node_sequence[n];
11975+
FlowInfo.retrieve_current_row_and_col(this_node,row,col);
11976+
get_lat_and_long_locations(row, col, latitude, longitude, Converter);
11977+
11978+
// Now get a bunch of information from the junction network
11979+
FlowInfo.retrieve_receiver_information(this_node, receiver_NI);
11980+
RJ = JN.get_Receiver_of_Junction(JI_map[this_node]);
11981+
UJ = JN.find_upstream_junction_from_channel_nodeindex(this_node,FlowInfo);
11982+
SO = SO_map[ this_node ];
11983+
11984+
11985+
11986+
11987+
chi_data_out.precision(9);
11988+
chi_data_out << latitude << ","
11989+
<< longitude << ","
11990+
<< this_node << ","
11991+
<< receiver_NI << ",";
11992+
chi_data_out.precision(5);
11993+
chi_data_out << chi_data_map[this_node] << ","
11994+
<< elev_data_map[this_node] << ","
11995+
<< flow_distance_data_map[this_node] << ","
11996+
<< drainage_area_data_map[this_node] << ","
11997+
<< source_keys_map[this_node] << ","
11998+
<< baselevel_keys_map[this_node] << ","
11999+
<< SO << ","
12000+
<< RJ << ","
12001+
<< UJ;
12002+
12003+
chi_data_out << endl;
12004+
}
12005+
}
12006+
12007+
chi_data_out.close();
12008+
12009+
}
12010+
//=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
12011+
12012+
12013+
12014+
1188212015
//=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
1188312016
// Print chi maps to file
1188412017
//=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
@@ -12275,12 +12408,19 @@ void LSDChiTools::print_basins(LSDFlowInfo& FlowInfo, LSDJunctionNetwork& Juncti
1227512408
int basin_key = -9999;
1227612409

1227712410
// need to node index of this junction
12278-
int node_of_junction = JunctionNetwork.get_Node_of_Junction( Junctions[BN] );
12279-
if ( key_to_baselevel_map.find( node_of_junction) != key_to_baselevel_map.end() )
12411+
if( key_to_baselevel_map.size() == 0)
1228012412
{
12281-
basin_key = key_to_baselevel_map[node_of_junction];
12413+
basin_key = BN;
1228212414
}
12283-
12415+
else
12416+
{
12417+
int node_of_junction = JunctionNetwork.get_Node_of_Junction( Junctions[BN] );
12418+
if ( key_to_baselevel_map.find( node_of_junction) != key_to_baselevel_map.end() )
12419+
{
12420+
basin_key = key_to_baselevel_map[node_of_junction];
12421+
}
12422+
}
12423+
1228412424
// get the centroid and outlet locations
1228512425
centroid_i = thisBasin.get_Centroid_i();
1228612426
centroid_j = thisBasin.get_Centroid_j();

‎src/LSDChiTools.hpp

+23
Original file line numberDiff line numberDiff line change
@@ -1129,13 +1129,36 @@ class LSDChiTools
11291129
/// @brief This prints a csv file with chi data from the data maps
11301130
/// the columns are:
11311131
/// latitude,longitude,chi,elevation,flow distance,drainage area,
1132+
/// source_key,basin_key,stream_order,receiver_junction,upstream_junction
11321133
/// @param FlowInfo an LSDFlowInfo object
11331134
/// @param filename The name of the filename to print to (should have full
11341135
/// path and the extension .csv
11351136
/// @author SMM
11361137
/// @date 05/06/2017
11371138
void print_chi_data_map_to_csv(LSDFlowInfo& FlowInfo, string filename);
11381139

1140+
/// @brief This prints a csv file with chi data from the data maps
1141+
/// the columns are:
1142+
/// latitude,longitude,ni,chi,elevation,flow distance,drainage area,
1143+
/// source_key,basin_key,stream_order,receiver_junction,upstream_junction,node_index
1144+
/// @param FlowInfo an LSDFlowInfo object
1145+
/// @param filename The name of the filename to print to (should have full
1146+
/// path and the extension .csv
1147+
/// @author SMM
1148+
/// @date 05/06/2017
1149+
void print_chi_data_map_to_csv_with_ni(LSDFlowInfo& FlowInfo, string filename);
1150+
1151+
/// @brief This prints a csv file with chi data from the data maps
1152+
/// the columns are:
1153+
/// latitude,longitude,ni,receiver_ni,chi,elevation,flow distance,drainage area,
1154+
/// source_key,basin_key,stream_order,receiver_junction,upstream_junction
1155+
/// @param FlowInfo an LSDFlowInfo object
1156+
/// @param filename The name of the filename to print to (should have full
1157+
/// path and the extension .csv
1158+
/// @author SMM
1159+
/// @date 05/06/2017
1160+
void print_chi_data_map_to_csv_with_junction_information(LSDFlowInfo& FlowInfo, LSDJunctionNetwork& JN, string filename);
1161+
11391162

11401163
/// @brief This prints a csv file with chi data from the data maps for a specific basin
11411164
/// the columns are:

‎src/LSDCosmoData.cpp

+28-6
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,11 @@ void LSDCosmoData::load_parameters(string filename)
695695
Muon_scaling = "Braucher";
696696
cout << "You have selected Braucher scaling" << endl;
697697
}
698+
if(value.find("braucherborchers") == 0 || value.find("BraucherBorchers") == 0)
699+
{
700+
Muon_scaling = "BraucherBorchers";
701+
cout << "You have selected Braucher/Borchers scaling" << endl;
702+
}
698703
else if(value.find("granger") == 0 || value.find("Granger") == 0)
699704
{
700705
Muon_scaling = "Granger";
@@ -1238,7 +1243,8 @@ void LSDCosmoData::check_parameter_values()
12381243
}
12391244

12401245
if (Muon_scaling != "Braucher" && Muon_scaling != "Granger" &&
1241-
Muon_scaling != "Schaller" && Muon_scaling != "newCRONUS")
1246+
Muon_scaling != "Schaller" && Muon_scaling != "newCRONUS" &&
1247+
Muon_scaling != "BraucherBorchers")
12421248
{
12431249
cout << "You have not seleceted a valid scaling. Defaulting to Braucher" << endl;
12441250
Muon_scaling = "Braucher";
@@ -4053,6 +4059,10 @@ vector<double> LSDCosmoData::full_CRN_erosion_analysis_point(double Nuclide_conc
40534059
{
40544060
LSDCRNP.set_Braucher_parameters();
40554061
}
4062+
else if (Muon_scaling == "BraucherBorchers" )
4063+
{
4064+
LSDCRNP.set_BraucherBorchers_parameters();
4065+
}
40564066
else if (Muon_scaling == "Granger" )
40574067
{
40584068
LSDCRNP.set_Granger_parameters();
@@ -4064,7 +4074,7 @@ vector<double> LSDCosmoData::full_CRN_erosion_analysis_point(double Nuclide_conc
40644074
else
40654075
{
40664076
cout << "You didn't set the muon scaling." << endl
4067-
<< "Options are Schaller, Braucher, newCRONUS, and Granger." << endl
4077+
<< "Options are Schaller, Braucher, newCRONUS, BraucherBorchers, and Granger." << endl
40684078
<< "You chose: " << Muon_scaling << endl
40694079
<< "Defaulting to Braucher et al (2009) scaling" << endl;
40704080
LSDCRNP.set_Braucher_parameters();
@@ -4226,6 +4236,10 @@ double LSDCosmoData::predict_CRN_erosion_point(double Nuclide_conc, string Nucli
42264236
{
42274237
LSDCRNP.set_Braucher_parameters();
42284238
}
4239+
else if (Muon_scaling == "BraucherBorchers" )
4240+
{
4241+
LSDCRNP.set_BraucherBorchers_parameters();
4242+
}
42294243
else if (Muon_scaling == "Granger" )
42304244
{
42314245
LSDCRNP.set_Granger_parameters();
@@ -4237,7 +4251,7 @@ double LSDCosmoData::predict_CRN_erosion_point(double Nuclide_conc, string Nucli
42374251
else
42384252
{
42394253
cout << "You didn't set the muon scaling." << endl
4240-
<< "Options are Schaller, Braucher, newCRONUS and Granger." << endl
4254+
<< "Options are Schaller, Braucher, BraucherBorchers, newCRONUS and Granger." << endl
42414255
<< "You chose: " << Muon_scaling << endl
42424256
<< "Defaulting to Braucher et al (2009) scaling" << endl;
42434257
LSDCRNP.set_Braucher_parameters();
@@ -4440,6 +4454,10 @@ double LSDCosmoData::predict_mean_CRN_conc_point(double eff_erosion_rate, string
44404454
{
44414455
LSDCRNP.set_Braucher_parameters();
44424456
}
4457+
else if (Muon_scaling == "BraucherBorchers" )
4458+
{
4459+
LSDCRNP.set_BraucherBorchers_parameters();
4460+
}
44434461
else if (Muon_scaling == "Granger" )
44444462
{
44454463
LSDCRNP.set_Granger_parameters();
@@ -4451,7 +4469,7 @@ double LSDCosmoData::predict_mean_CRN_conc_point(double eff_erosion_rate, string
44514469
else
44524470
{
44534471
cout << "You didn't set the muon scaling." << endl
4454-
<< "Options are Schaller, Braucher, newCRONUS, and Granger." << endl
4472+
<< "Options are Schaller, Braucher, BraucherBorchers, newCRONUS, and Granger." << endl
44554473
<< "You chose: " << Muon_scaling << endl
44564474
<< "Defaulting to Braucher et al (2009) scaling" << endl;
44574475
LSDCRNP.set_Braucher_parameters();
@@ -4973,10 +4991,14 @@ void LSDCosmoData::point_measurements(vector<int> valid_samples,vector<double> s
49734991
{
49744992
LSDCRNP.set_Schaller_parameters();
49754993
}
4976-
else if (Muon_scaling == "Braucher" )
4994+
else if (Muon_scaling == "Braucher" )
49774995
{
49784996
LSDCRNP.set_Braucher_parameters();
49794997
}
4998+
else if (Muon_scaling == "BraucherBorchers" )
4999+
{
5000+
LSDCRNP.set_BraucherBorchers_parameters();
5001+
}
49805002
else if (Muon_scaling == "Granger" )
49815003
{
49825004
LSDCRNP.set_Granger_parameters();
@@ -4988,7 +5010,7 @@ void LSDCosmoData::point_measurements(vector<int> valid_samples,vector<double> s
49885010
else
49895011
{
49905012
cout << "You didn't set the muon scaling." << endl
4991-
<< "Options are Schaller, Braucher, newCRONUS, and Granger." << endl
5013+
<< "Options are Schaller, Braucher, BraucherBorchers, newCRONUS, and Granger." << endl
49925014
<< "You chose: " << Muon_scaling << endl
49935015
<< "Defaulting to Braucher et al (2009) scaling" << endl;
49945016
LSDCRNP.set_Braucher_parameters();

0 commit comments

Comments
 (0)