tuse concentrations from web interface, add note on concentration format - 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 bf513d5c43c1ab13db6e5a3ef181fad631cc9f7a
(DIR) parent c28bb351d2f77d6ea3f181a21a44cb34ffe0a361
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Wed, 26 Aug 2015 13:58:49 +0200
use concentrations from web interface, add note on concentration format
Diffstat:
M matlab/mcmc_inversion.m | 11 ++++++-----
M pages/history.html | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
---
(DIR) diff --git a/matlab/mcmc_inversion.m b/matlab/mcmc_inversion.m
t@@ -13,7 +13,8 @@ function [] = mcmc_inversion(matlab_scripts_folder, debug, ...
% function is called from `file_scanner_mcmc_starter.m`
-%clear; close all; format compact
+%clear; close all;
+format compact;
%Set path so that we can find other required m-files
addpath(matlab_scripts_folder)
t@@ -66,7 +67,7 @@ switch fs.g_case
if strcmp(fs.dobsMode,'ObservedData')
fs.d_obs = [];
%fs.d_obs = repmat([5.3e8;3.7e9]',length(fs.zobs),1); %<<<<<< put in values as best you can
- fs.d_obs = repmat([5.3e8;3.7e9]',length(fs.zobs),1);
+ fs.d_obs = repmat(concentrations',length(fs.zobs),1);
fs.d_obs = fs.d_obs(:);
end
if length(fs.RelErrorObs) == 1
t@@ -229,9 +230,9 @@ for iwalk=1:fixed_stuff.Nwalkers
sound(sin(1:0.5:500))
end
-sound(0.5*sin(1:0.5:500));pause(0.3);sound(0.5*sin(1:0.75:750))
-pause(0.6)
-sound(0.5*sin(1:0.5:500));pause(0.3);sound(0.5*sin(1:0.75:750))
+% sound(0.5*sin(1:0.5:500));pause(0.3);sound(0.5*sin(1:0.75:750))
+% pause(0.6)
+% sound(0.5*sin(1:0.5:500));pause(0.3);sound(0.5*sin(1:0.75:750))
save_file = ['Walks_',datestr(now,'yyyymmdd_HHMMSS')];
save(save_file,'Ss','save_file')
(DIR) diff --git a/pages/history.html b/pages/history.html
t@@ -108,7 +108,7 @@
<b>Concentrations of terrestrial cosmogenic nuclides (TCNs)
[atoms kg<sup>-1</sup>]</b> <br>
Fill in <b>at least one</b> field, leave unknown values
- blank.<br>
+ blank. Scientific notation (e.g. 3.5e9) is recommended.<br>
<div class="input-field col s3">
<input id="be_conc" name="be_conc" type="text"
class="validate">