tchange from mm/yr to m/yr in matlab files - 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 56a526072365d711c52d0350ce0e90670cacaa02
(DIR) parent 74cedd1436caf6714e2420a0d876d372a2ea344a
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Thu, 3 Dec 2015 12:34:04 +0100
change from mm/yr to m/yr in matlab files
Diffstat:
M matlab/generate_plots.m | 36 ++++++++++++++++----------------
M matlab/import_php_file.m | 10 +++++-----
2 files changed, 23 insertions(+), 23 deletions(-)
---
(DIR) diff --git a/matlab/generate_plots.m b/matlab/generate_plots.m
t@@ -241,8 +241,8 @@ for i1 = 1:M % for each model parameter
%bar(xbins{i1},Nhistc,'histc')
if i1 == 1 || i1 == 2
- % change units from mm/yr to m/Myr
- histogram(Ss{iwalk}.ms(i1,:)*1000., xbins{i1}*1000.);
+ % change units from m/yr to m/Myr
+ histogram(Ss{iwalk}.ms(i1,:)*1.0e6, xbins{i1}*1.0e6);
else
histogram(Ss{iwalk}.ms(i1,:), xbins{i1});
end
t@@ -254,9 +254,9 @@ for i1 = 1:M % for each model parameter
xlabel('\epsilon_{int} [m/Myr]')
text(0.02,0.98,'a', 'Units', ...
'Normalized', 'VerticalAlignment', 'Top')
- epsilon_int_25(iwalk) = prctile(Ss{iwalk}.ms(i1,:)*1000., 25);
- epsilon_int_50(iwalk) = prctile(Ss{iwalk}.ms(i1,:)*1000., 50);
- epsilon_int_75(iwalk) = prctile(Ss{iwalk}.ms(i1,:)*1000., 75);
+ epsilon_int_25(iwalk) = prctile(Ss{iwalk}.ms(i1,:)*1.0e6, 25);
+ epsilon_int_50(iwalk) = prctile(Ss{iwalk}.ms(i1,:)*1.0e6, 50);
+ epsilon_int_75(iwalk) = prctile(Ss{iwalk}.ms(i1,:)*1.0e6, 75);
elseif i1 == 2
%xlabel('Glacial erosion rate [mm/yr]')
t@@ -264,9 +264,9 @@ for i1 = 1:M % for each model parameter
xlabel('\epsilon_{gla} [m/Myr]')
text(0.02,0.98,'b', 'Units', ...
'Normalized', 'VerticalAlignment', 'Top')
- epsilon_gla_25(iwalk) = prctile(Ss{iwalk}.ms(i1,:)*1000., 25);
- epsilon_gla_50(iwalk) = prctile(Ss{iwalk}.ms(i1,:)*1000., 50);
- epsilon_gla_75(iwalk) = prctile(Ss{iwalk}.ms(i1,:)*1000., 75);
+ epsilon_gla_25(iwalk) = prctile(Ss{iwalk}.ms(i1,:)*1.0e6, 25);
+ epsilon_gla_50(iwalk) = prctile(Ss{iwalk}.ms(i1,:)*1.0e6, 50);
+ epsilon_gla_75(iwalk) = prctile(Ss{iwalk}.ms(i1,:)*1.0e6, 75);
elseif i1 == 3
%xlabel('Timing of last deglaciation [yr]')
t@@ -292,8 +292,8 @@ for i1 = 1:M % for each model parameter
if i1 == 1 || i1 == 2 % shift axes for new units
switch mDistr(i1,:)
- case 'uniform', set(gca,'xscale','lin','xlim',mminmax(i1,:)*1000.)
- case 'logunif', set(gca,'xscale','log','xlim',mminmax(i1,:)*1000.)
+ case 'uniform', set(gca,'xscale','lin','xlim',mminmax(i1,:)*1.0e6)
+ case 'logunif', set(gca,'xscale','log','xlim',mminmax(i1,:)*1.0e6)
end
else
switch mDistr(i1,:)
t@@ -317,7 +317,7 @@ for i1 = 1:M % for each model parameter
data = [];
for iwalker=1:Nwalkers
if i1 == 1 || i1 == 2
- data = [data, Ss{iwalker}.ms(i1,:)*1000.];
+ data = [data, Ss{iwalker}.ms(i1,:)*1.0e6];
else
data = [data, Ss{iwalker}.ms(i1,:)];
end
t@@ -327,7 +327,7 @@ for i1 = 1:M % for each model parameter
%Nhistc=histc(data, xbins{i1});
%bar(xbins{i1},Nhistc,'histc')
if i1 == 1 || i1 == 2
- xbins{i1} = xbins{i1}*1000.; % change to m/Myr
+ xbins{i1} = xbins{i1}*1.0e6; % change to m/Myr
end
histogram(data, xbins{i1});
t@@ -399,8 +399,8 @@ for i1 = 1:M % for each model parameter
if i1 == 1 || i1 == 2 % shift axes for new units
switch mDistr(i1,:)
- case 'uniform', set(gca,'xscale','lin','xlim',mminmax(i1,:)*1000.)
- case 'logunif', set(gca,'xscale','log','xlim',mminmax(i1,:)*1000.)
+ case 'uniform', set(gca,'xscale','lin','xlim',mminmax(i1,:)*1.0e6)
+ case 'logunif', set(gca,'xscale','log','xlim',mminmax(i1,:)*1.0e6)
end
else
switch mDistr(i1,:)
t@@ -943,13 +943,13 @@ html = ['\n' ...
' </tr>\n'...
' <tr>\n'...
' <td>ε<sub>gla</sub></td>\n'...
- ' <td>' num2str(epsilon_gla_min*1000.) ...
- ' to ' num2str(epsilon_gla_max*1000.) ' m/Myr</td>\n'...
+ ' <td>' num2str(epsilon_gla_min*1.0e6) ...
+ ' to ' num2str(epsilon_gla_max*1.0e6) ' m/Myr</td>\n'...
' </tr>\n'...
' <tr>\n'...
' <td>ε<sub>int</sub></td>\n'...
- ' <td>' num2str(epsilon_int_min*1000.) ...
- ' to ' num2str(epsilon_int_max*1000.) ' m/Myr</td>\n'...
+ ' <td>' num2str(epsilon_int_min*1.0e6) ...
+ ' to ' num2str(epsilon_int_max*1.0e6) ' m/Myr</td>\n'...
' </tr>\n'...
' <tr>\n'...
' <td><i>t</i><sub>degla</sub></td>\n'...
(DIR) diff --git a/matlab/import_php_file.m b/matlab/import_php_file.m
t@@ -174,7 +174,7 @@ 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
-epsilon_gla_min = epsilon_gla_min/1000.; % m/Myr to mm/yr
-epsilon_gla_max = epsilon_gla_max/1000.; % m/Myr to mm/yr
-epsilon_int_min = epsilon_int_min/1000.; % m/Myr to mm/yr
-epsilon_int_max = epsilon_int_max/1000.; % m/Myr to mm/yr
-\ No newline at end of file
+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
+epsilon_int_max = epsilon_int_max/1.0e6; % m/Myr to m/yr
+\ No newline at end of file