diff --git a/NUCLEUSinv/NUCLEUSinv.m b/NUCLEUSinv/NUCLEUSinv.m
index b46bbbf..383efa0 100644
--- a/NUCLEUSinv/NUCLEUSinv.m
+++ b/NUCLEUSinv/NUCLEUSinv.m
@@ -38,8 +38,8 @@
if ~isempty(h0); close(h0); end
%% GUI 'header' info and defaults
-myui.version = '0.1.2';
-myui.date = '20.02.2019';
+myui.version = '0.1.3';
+myui.date = '21.02.2019';
myui.author = 'Thomas Hiller';
myui.email = 'thomas.hiller[at]leibniz-liag.de';
myui.fontsize = 10;
diff --git a/NUCLEUSinv/NUCLEUSinv_updateInterface.m b/NUCLEUSinv/NUCLEUSinv_updateInterface.m
index 964070a..ebe28ea 100644
--- a/NUCLEUSinv/NUCLEUSinv_updateInterface.m
+++ b/NUCLEUSinv/NUCLEUSinv_updateInterface.m
@@ -685,7 +685,7 @@
case 's'
set(gui.radio_handles.process_timescale_s,'Enable','on','Value',1);
set(gui.radio_handles.process_timescale_ms,'Enable','on','Value',0);
- set(gui.text_handles.invstd_RTDtimes,'String','RTD - min [s] | max [s] | N / dec',...
+ set(gui.text_handles.invstd_RTDtimes,'String','RTD - min [s] | max [s] | # / dec',...
'FontSize',10);
set(gui.text_handles.petro_Tbulk,'String',...
['Tbulk [s] | ',char(hex2dec('03C1')),' [µm/s] | geom']);
@@ -693,7 +693,7 @@
case 'ms'
set(gui.radio_handles.process_timescale_s,'Enable','on','Value',0);
set(gui.radio_handles.process_timescale_ms,'Enable','on','Value',1);
- set(gui.text_handles.invstd_RTDtimes,'String','RTD - min [ms] | max [ms] | N / dec',...
+ set(gui.text_handles.invstd_RTDtimes,'String','RTD - min [ms] | max [ms] | # / dec',...
'FontSize',9);
set(gui.text_handles.petro_Tbulk,'String',...
['Tbulk [ms] | ',char(hex2dec('03C1')),' [µm/s] | geom']);
diff --git a/NUCLEUSmod/NUCLEUSmod.m b/NUCLEUSmod/NUCLEUSmod.m
index b43e329..34d03ae 100644
--- a/NUCLEUSmod/NUCLEUSmod.m
+++ b/NUCLEUSmod/NUCLEUSmod.m
@@ -41,8 +41,8 @@
if ~isempty(h0); close(h0); end
%% GUI 'header' info and defaults
-myui.version = '0.1.2';
-myui.date = '20.02.2019';
+myui.version = '0.1.3';
+myui.date = '21.02.2019';
myui.author = 'Thomas Hiller';
myui.email = 'thomas.hiller[at]leibniz-liag.de';
myui.fontsize = 10;
diff --git a/NUCLEUSmod/NUCLEUSmod_createPanelNMR.m b/NUCLEUSmod/NUCLEUSmod_createPanelNMR.m
index 23c9d77..5755e45 100644
--- a/NUCLEUSmod/NUCLEUSmod_createPanelNMR.m
+++ b/NUCLEUSmod/NUCLEUSmod_createPanelNMR.m
@@ -105,14 +105,14 @@
%% noise & porosity
gui.text_handles.noise = uicontrol('Parent',gui.panels.nmr.HBox4,...
'Style','text','FontSize',myui.fontsize,'HorizontalAlignment','center',...
- 'String','add noise [%]');
+ 'String','add noise');
tstr = ['Set NMR data noise.
',...
'Hint:
',...
'You do not need to press RUN to add noise to the NMR signals.
',...
'The raw NMR signals are stored internally and the noise is
',...
'applied instantaneously.
',...
'Default value:
',...
- '0 %
'];
+ '0
'];
gui.edit_handles.noise = uicontrol('Parent',gui.panels.nmr.HBox4,...
'Style','edit','String',num2str(data.nmr.noise),'FontSize',myui.fontsize,...
'UserData',struct('Tooltipstr',tstr,'defaults',[data.nmr.noise 1 1]),...
diff --git a/callbacks/edits/onEditValue.m b/callbacks/edits/onEditValue.m
index e5c1f02..327cf0f 100644
--- a/callbacks/edits/onEditValue.m
+++ b/callbacks/edits/onEditValue.m
@@ -16,8 +16,6 @@ function onEditValue(src,~)
%
% Other m-files required:
% calculateGeometry
-% calculateNMRnoise
-% calculateNMRporosity
% calibratePorosity
% clearSingleAxis
% NUCLEUSinv_updateInterface
@@ -26,6 +24,7 @@ function onEditValue(src,~)
% removeInversionFields
% processNMRDataControl
% updateInfo
+% updateNMRsignals
% updatePlotsDistribution
% updatePlotsNMR
% updatePlotsSignal
@@ -193,6 +192,7 @@ function onEditValue(src,~)
clearSingleAxis(gui.axes_handles.nmr);
setappdata(fig,'data',data);
calculateGeometry;
+
case 'pressure'
switch out.field
case 'range'
@@ -207,16 +207,22 @@ function onEditValue(src,~)
clearSingleAxis(gui.axes_handles.nmr);
setappdata(fig,'data',data);
NUCLEUSmod_updateInterface;
+
case 'nmr'
switch out.field
case 'noise'
if isfield(data.results,'NMR')
- calculateNMRnoise;
+ updateNMRsignals;
updatePlotsNMR;
end
case 'porosity'
+ if data.nmr.porosity <= 0 || data.nmr.porosity > 1
+ data.nmr.porosity = 1;
+ set(src,'String',num2str(data.nmr.porosity));
+ setappdata(fig,'data',data);
+ end
if isfield(data.results,'NMR')
- calculateNMRporosity;
+ updateNMRsignals;
updatePlotsNMR;
end
otherwise
diff --git a/callbacks/listboxes/onListboxData.m b/callbacks/listboxes/onListboxData.m
index 9b1d210..b800d74 100644
--- a/callbacks/listboxes/onListboxData.m
+++ b/callbacks/listboxes/onListboxData.m
@@ -149,7 +149,9 @@ function onListboxData(src,~)
data.param.sampVol = 1;
end
if isfield(data.import,'NMRMOD')
- data.invstd.Tbulk = data.import.NMR.para{id}.Tbulk;
+ data.param.rho = data.import.NMR.para{id}.rho*1e6;
+ data.invstd.Tbulk = data.import.NMR.para{id}.Tbulk;
+ data.invstd.porosity = data.import.NMR.para{id}.porosity;
end
% ---
diff --git a/doc/nucleus/NUCLEUSinv/NUCLEUSinv.html b/doc/nucleus/NUCLEUSinv/NUCLEUSinv.html
index de24a09..f0172c0 100644
--- a/doc/nucleus/NUCLEUSinv/NUCLEUSinv.html
+++ b/doc/nucleus/NUCLEUSinv/NUCLEUSinv.html
@@ -111,8 +111,8 @@