tfix internal uncertainty values - cosmo - front and backend for Markov-Chain Monte Carlo inversion of cosmogenic nuclide concentrations
(HTM) git clone git://src.adamsgaard.dk/cosmo
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 1ca0a617715320666a6a2eaf9ed90a7156057982
(DIR) parent 3df2de3130aac5b7b292e874004f38e845584362
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Thu, 3 Dec 2015 17:15:56 +0100
fix internal uncertainty values
Diffstat:
M matlab/generate_plots.m | 8 ++++----
M matlab/import_php_file.m | 5 +++++
M matlab/m_pakke2014maj11/gCosmoLong… | 96 +++++++++++++++----------------
3 files changed, 55 insertions(+), 54 deletions(-)
---
(DIR) diff --git a/matlab/generate_plots.m b/matlab/generate_plots.m
t@@ -887,19 +887,19 @@ html = ['\n' ...
' </tr>\n'...
' <tr>\n'...
' <td><sup>10</sup>Be conc. uncertainty</td>\n'...
- ' <td>' num2str(be_uncer) ' %%</td>\n'...
+ ' <td>' num2str(be_uncer*100.) ' %%</td>\n'...
' </tr>\n'...
' <tr>\n'...
' <td><sup>26</sup>Al conc. uncertainty</td>\n'...
- ' <td>' num2str(al_uncer) ' %%</td>\n'...
+ ' <td>' num2str(al_uncer*100.) ' %%</td>\n'...
' </tr>\n'...
' <tr>\n'...
' <td><sup>14</sup>C conc. uncertainty</td>\n'...
- ' <td>' num2str(c_uncer) ' %%</td>\n'...
+ ' <td>' num2str(c_uncer*100.) ' %%</td>\n'...
' </tr>\n'...
' <tr>\n'...
' <td><sup>21</sup>Ne conc. uncertainty</td>\n'...
- ' <td>' num2str(ne_uncer) ' %%</td>\n'...
+ ' <td>' num2str(ne_uncer*100.) ' %%</td>\n'...
' </tr>\n'...
' <tr>\n'...
' <td>Observation depth</td>\n'...
(DIR) diff --git a/matlab/import_php_file.m b/matlab/import_php_file.m
t@@ -174,6 +174,11 @@ al_prod_muon = al_prod_muon*1000.; % atoms/g/yr to atoms/kg/yr
c_prod_muon = c_prod_muon*1000.; % atoms/g/yr to atoms/kg/yr
ne_prod_muon = ne_prod_muon*1000.; % atoms/g/yr to atoms/kg/yr
+be_uncer = be_uncer/100.; % percent to fraction
+al_uncer = al_uncer/100.; % percent to fraction
+c_uncer = c_uncer/100.; % percent to fraction
+ne_uncer = ne_uncer/100.; % percent to fraction
+
epsilon_gla_min = epsilon_gla_min/1.0e6; % m/Myr to m/yr
epsilon_gla_max = epsilon_gla_max/1.0e6; % m/Myr to m/yr
epsilon_int_min = epsilon_int_min/1.0e6; % m/Myr to m/yr
(DIR) diff --git a/matlab/m_pakke2014maj11/gCosmoLongsteps.m b/matlab/m_pakke2014maj11/gCosmoLongsteps.m
t@@ -108,19 +108,18 @@ fm_rat26 = (0.6/(0.7+0.6));
%10Be production
% Input fra Kasper
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - Start
-%P10_top_spal=5.33e3; %atoms/kg/yr
-%P10_top_nm=0.106e3; %atoms/kg/yr
-%P10_top_fm=0.093e3; %atoms/kg/yr
+P10_top_spal=5.33e3; %atoms/kg/yr
+P10_top_nm=0.106e3; %atoms/kg/yr
+P10_top_fm=0.093e3; %atoms/kg/yr
-if ~isempty(fixed_stuff.be_prod_spall) && ...
- ~isempty(fixed_stuff.be_prod_muons)
- P10_top_spal = fixed_stuff.be_prod_spall;
- P10_top_nm = nm_rat10*fixed_stuff.be_prod_muons;
- P10_top_fm = fm_rat10*fixed_stuff.be_prod_muons;
-else
- P10_top_spal=5.33e3; %atoms/kg/yr
- P10_top_nm=0.106e3; %atoms/kg/yr
- P10_top_fm=0.093e3; %atoms/kg/yr
+if exist('fixed_stuff.be_prod_spall', 'var') == 1 && ...
+ exist('fixed_stuff.be_prod_muons', 'var') == 1
+ if ~isempty(fixed_stuff.be_prod_spall) && ...
+ ~isempty(fixed_stuff.be_prod_muons)
+ P10_top_spal = fixed_stuff.be_prod_spall;
+ P10_top_nm = nm_rat10*fixed_stuff.be_prod_muons;
+ P10_top_fm = fm_rat10*fixed_stuff.be_prod_muons;
+ end
end
%Reference values for Kasper
t@@ -154,19 +153,18 @@ end
% Input fra Kasper
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - Start
-%P26_top_spal=31.1e3; %atoms/kg/yr
-%P26_top_nm=0.7e3; %atoms/kg/yr
-%P26_top_fm=0.6e3; %atoms/kg/yr
+P26_top_spal=31.1e3; %atoms/kg/yr
+P26_top_nm=0.7e3; %atoms/kg/yr
+P26_top_fm=0.6e3; %atoms/kg/yr
-if ~isempty(fixed_stuff.al_prod_spall) && ...
- ~isempty(fixed_stuff.al_prod_muons)
- P26_top_spal = fixed_stuff.al_prod_spall;
- P26_top_nm = nm_rat26*fixed_stuff.al_prod_muons;
- P26_top_fm = fm_rat26*fixed_stuff.al_prod_muons;
-else
- P26_top_spal=31.1e3; %atoms/kg/yr
- P26_top_nm=0.7e3; %atoms/kg/yr
- P26_top_fm=0.6e3; %atoms/kg/yr
+if exist('fixed_stuff.al_prod_spall', 'var') == 1 && ...
+ exist('fixed_stuff.al_prod_muons', 'var') == 1
+ if ~isempty(fixed_stuff.al_prod_spall) && ...
+ ~isempty(fixed_stuff.al_prod_muons)
+ P26_top_spal = fixed_stuff.al_prod_spall;
+ P26_top_nm = nm_rat26*fixed_stuff.al_prod_muons;
+ P26_top_fm = fm_rat26*fixed_stuff.al_prod_muons;
+ end
end
%Reference values for Kasper
t@@ -190,19 +188,18 @@ end
% P26_total = (P26_spal + P26_nm + P26_fm);
%21Ne production
-%P21_top_spal=20.8e3; %atoms/kg/yr
-%P21_top_nm=0.4e3; %atoms/kg/yr
-%P21_top_fm=0.35e3; %atoms/kg/yr
-
-if ~isempty(fixed_stuff.ne_prod_spall) && ...
- ~isempty(fixed_stuff.ne_prod_muons)
- P21_top_spal = fixed_stuff.ne_prod_spall;
- P21_top_nm = nm_rat10*fixed_stuff.ne_prod_muons;
- P21_top_fm = fm_rat10*fixed_stuff.ne_prod_muons;
-else
- P21_top_spal=20.8e3; %atoms/kg/yr
- P21_top_nm=0.4e3; %atoms/kg/yr
- P21_top_fm=0.35e3; %atoms/kg/yr
+P21_top_spal=20.8e3; %atoms/kg/yr
+P21_top_nm=0.4e3; %atoms/kg/yr
+P21_top_fm=0.35e3; %atoms/kg/yr
+
+if exist('fixed_stuff.ne_prod_spall', 'var') == 1 && ...
+ exist('fixed_stuff.ne_prod_muons', 'var') == 1
+ if ~isempty(fixed_stuff.ne_prod_spall) && ...
+ ~isempty(fixed_stuff.ne_prod_muons)
+ P21_top_spal = fixed_stuff.ne_prod_spall;
+ P21_top_nm = nm_rat10*fixed_stuff.ne_prod_muons;
+ P21_top_fm = fm_rat10*fixed_stuff.ne_prod_muons;
+ end
end
% P21_spal = P21_top_spal*exp(-z*rho/Tau_spal);
t@@ -212,19 +209,18 @@ end
% P21_total = (P21_spal + P21_nm + P21_fm);
%14C production
-%P14_top_spal=14.6e3; %atoms/kg/yr
-%P14_top_nm=2.3e3; %atoms/kg/yr
-%P14_top_fm=2.1e3; %atoms/kg/yr
-
-if ~isempty(fixed_stuff.c_prod_spall) && ...
- ~isempty(fixed_stuff.c_prod_muons)
- P14_top_spal = fixed_stuff.c_prod_spall;
- P14_top_nm = nm_rat10*fixed_stuff.c_prod_muons;
- P14_top_fm = fm_rat10*fixed_stuff.c_prod_muons;
-else
- P14_top_spal=14.6e3; %atoms/kg/yr
- P14_top_nm=2.3e3; %atoms/kg/yr
- P14_top_fm=2.1e3; %atoms/kg/yr
+P14_top_spal=14.6e3; %atoms/kg/yr
+P14_top_nm=2.3e3; %atoms/kg/yr
+P14_top_fm=2.1e3; %atoms/kg/yr
+
+if exist('fixed_stuff.c_prod_spall', 'var') == 1 && ...
+ exist('fixed_stuff.c_prod_muons', 'var') == 1
+ if ~isempty(fixed_stuff.c_prod_spall) && ...
+ ~isempty(fixed_stuff.c_prod_muons)
+ P14_top_spal = fixed_stuff.c_prod_spall;
+ P14_top_nm = nm_rat10*fixed_stuff.c_prod_muons;
+ P14_top_fm = fm_rat10*fixed_stuff.c_prod_muons;
+ end
end
% P14_spal = P14_top_spal*exp(-z*rho/Tau_spal);