tfix min erosion rate - 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 74c25ccd8c430a3d4b9c31412ca98ccb66da01cc
(DIR) parent 0f9f172afdeb8f39cf9a095807f12ef82bcf016d
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Thu, 3 Dec 2015 15:47:45 +0100
fix min erosion rate
Diffstat:
M Makefile | 2 +-
M js/history-form-prefiller.js | 2 +-
M matlab/file_scanner_mcmc_starter.m | 8 ++++++--
3 files changed, 8 insertions(+), 4 deletions(-)
---
(DIR) diff --git a/Makefile b/Makefile
t@@ -7,7 +7,7 @@ open:
open "https://cosmo.au.dk" #&& open "http://localhost/~ad/cosmo"
folders:
- mkdir -p input && chmod 777 input && mkdir -p archive
+ mkdir -p input && chmod 777 input && mkdir -p archive && mkdir -p wait
deploy:
rsync -rav index.php recaptchalib.php \
(DIR) diff --git a/js/history-form-prefiller.js b/js/history-form-prefiller.js
t@@ -33,7 +33,7 @@ var PrefillMachine = {
$("#epsilon_gla_min").val("0.1");
$("#epsilon_gla_max").val("1000");
- $("#epsilon_int_min").val("1.0");
+ $("#epsilon_int_min").val("0.1");
$("#epsilon_int_max").val("1000");
$("#t_degla_min").val("10000");
(DIR) diff --git a/matlab/file_scanner_mcmc_starter.m b/matlab/file_scanner_mcmc_starter.m
t@@ -11,14 +11,18 @@
% and status file
infolder = '~/cosmo/input';
+% folder containing input files from web interface while their contents are
+% being used by matlab
+waitfolder = '~/cosmo/wait';
+
% outfolder: folder for generated plots
+outfolder = '/var/www/html/output/';
+
[status, hostname] = system('hostname');
if ~isempty(strfind(hostname, 'flaptop')) || ...
~isempty(strfind(hostname, 'adc-server')) % laptop or desktop
infolder = '~/src/cosmo/input';
outfolder = 'output/';
-else % cosmo server
- outfolder = '/var/www/html/output/';
end
% uniquely identifying file name prefix for input files