Skip to content

Commit

Permalink
NUCLEUSinv & NUCLEUSmod update:
Browse files Browse the repository at this point in the history 
NUCLEUSmod:
1.) NUCLEUSmod_createPanelNMR: removed the %-sign from the noise text field because the noise is now handled as absolute value
2.) updateNMRsignals: cleaned up the forward NMR signal calculation (noise and porosity scaling get handled now within the same routine)

NUCLEUSinv:
1.) NUCLEUSinv_updateInterface: fixed a string that changed a text field of the GUI (RTD N/dec -> #/dec)
2.) runInversionJoint: at the beginning of the joint inversion, the error vector "e" is now scaled correctly (accounting for noise and porosity/water content)
3.) all RTDs and PSDs axes have now volumetric water content as y-label
4.) added water content to csv-export of "LIAG archive"-option
5.) when using NUCLEUSmod data in NUCLEUSinv: porosity and surface relaxivity get imported now too
6.) when using NUCLEUSmod data in NUCLEUSinv: when performing a joint inversion to compare forward and inverted PSD, water content on the y-axis is now correct (added a rescaling after scaling by the integral of individual PSDs)
  • Loading branch information
@ThoHiller
ThoHiller committed Feb 22, 2019
1 parent 96476f7 commit 867b874
Show file tree
Hide file tree
Showing 37 changed files with 1,554 additions and 1,715 deletions.
4 changes: 2 additions & 2 deletions NUCLEUSinv/NUCLEUSinv.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions NUCLEUSinv/NUCLEUSinv_updateInterface.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -685,15 +685,15 @@
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']);

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']);
Expand Down
4 changes: 2 additions & 2 deletions NUCLEUSmod/NUCLEUSmod.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions NUCLEUSmod/NUCLEUSmod_createPanelNMR.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ['<HTML>Set NMR data noise.<br><br>',...
'<u>Hint:</u><br>',...
'You do not need to press RUN to add noise to the NMR signals.<br>',...
'The raw NMR signals are stored internally and the noise is<br>',...
'applied instantaneously.<br><br>',...
'<u>Default value:</u><br>',...
'<b>0 %</b><br>'];
'<b>0</b><br>'];
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]),...
Expand Down
14 changes: 10 additions & 4 deletions callbacks/edits/onEditValue.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ function onEditValue(src,~)
%
% Other m-files required:
% calculateGeometry
% calculateNMRnoise
% calculateNMRporosity
% calibratePorosity
% clearSingleAxis
% NUCLEUSinv_updateInterface
Expand All @@ -26,6 +24,7 @@ function onEditValue(src,~)
% removeInversionFields
% processNMRDataControl
% updateInfo
% updateNMRsignals
% updatePlotsDistribution
% updatePlotsNMR
% updatePlotsSignal
Expand Down Expand Up @@ -193,6 +192,7 @@ function onEditValue(src,~)
clearSingleAxis(gui.axes_handles.nmr);
setappdata(fig,'data',data);
calculateGeometry;

case 'pressure'
switch out.field
case 'range'
Expand All @@ -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
Expand Down
4 changes: 3 additions & 1 deletion callbacks/listboxes/onListboxData.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
% ---

Expand Down
4 changes: 2 additions & 2 deletions doc/nucleus/NUCLEUSinv/NUCLEUSinv.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ <h2><a name="_source"></a>SOURCE CODE <a href="#_top"><img alt="^" border="0" sr
0038 <span class="keyword">if</span> ~isempty(h0); close(h0); <span class="keyword">end</span>
0039
0040 <span class="comment">%% GUI 'header' info and defaults</span>
0041 myui.version = <span class="string">'0.1.2'</span>;
0042 myui.date = <span class="string">'20.02.2019'</span>;
0041 myui.version = <span class="string">'0.1.3'</span>;
0042 myui.date = <span class="string">'21.02.2019'</span>;
0043 myui.author = <span class="string">'Thomas Hiller'</span>;
0044 myui.email = <span class="string">'thomas.hiller[at]leibniz-liag.de'</span>;
0045 myui.fontsize = 10;
Expand Down
4 changes: 2 additions & 2 deletions doc/nucleus/NUCLEUSinv/NUCLEUSinv_updateInterface.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -765,15 +765,15 @@ <h2><a name="_source"></a>SOURCE CODE <a href="#_top"><img alt="^" border="0" sr
0685 <span class="keyword">case</span> <span class="string">'s'</span>
0686 set(gui.radio_handles.process_timescale_s,<span class="string">'Enable'</span>,<span class="string">'on'</span>,<span class="string">'Value'</span>,1);
0687 set(gui.radio_handles.process_timescale_ms,<span class="string">'Enable'</span>,<span class="string">'on'</span>,<span class="string">'Value'</span>,0);
0688 set(gui.text_handles.invstd_RTDtimes,<span class="string">'String'</span>,<span class="string">'RTD - min [s] | max [s] | N / dec'</span>,<span class="keyword">...</span>
0688 set(gui.text_handles.invstd_RTDtimes,<span class="string">'String'</span>,<span class="string">'RTD - min [s] | max [s] | # / dec'</span>,<span class="keyword">...</span>
0689 <span class="string">'FontSize'</span>,10);
0690 set(gui.text_handles.petro_Tbulk,<span class="string">'String'</span>,<span class="keyword">...</span>
0691 [<span class="string">'Tbulk [s] | '</span>,char(hex2dec(<span class="string">'03C1'</span>)),<span class="string">' [µm/s] | geom'</span>]);
0692
0693 <span class="keyword">case</span> <span class="string">'ms'</span>
0694 set(gui.radio_handles.process_timescale_s,<span class="string">'Enable'</span>,<span class="string">'on'</span>,<span class="string">'Value'</span>,0);
0695 set(gui.radio_handles.process_timescale_ms,<span class="string">'Enable'</span>,<span class="string">'on'</span>,<span class="string">'Value'</span>,1);
0696 set(gui.text_handles.invstd_RTDtimes,<span class="string">'String'</span>,<span class="string">'RTD - min [ms] | max [ms] | N / dec'</span>,<span class="keyword">...</span>
0696 set(gui.text_handles.invstd_RTDtimes,<span class="string">'String'</span>,<span class="string">'RTD - min [ms] | max [ms] | # / dec'</span>,<span class="keyword">...</span>
0697 <span class="string">'FontSize'</span>,9);
0698 set(gui.text_handles.petro_Tbulk,<span class="string">'String'</span>,<span class="keyword">...</span>
0699 [<span class="string">'Tbulk [ms] | '</span>,char(hex2dec(<span class="string">'03C1'</span>)),<span class="string">' [µm/s] | geom'</span>]);
Expand Down
4 changes: 2 additions & 2 deletions doc/nucleus/NUCLEUSmod/NUCLEUSmod.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ <h2><a name="_source"></a>SOURCE CODE <a href="#_top"><img alt="^" border="0" sr
0041 <span class="keyword">if</span> ~isempty(h0); close(h0); <span class="keyword">end</span>
0042
0043 <span class="comment">%% GUI 'header' info and defaults</span>
0044 myui.version = <span class="string">'0.1.2'</span>;
0045 myui.date = <span class="string">'20.02.2019'</span>;
0044 myui.version = <span class="string">'0.1.3'</span>;
0045 myui.date = <span class="string">'21.02.2019'</span>;
0046 myui.author = <span class="string">'Thomas Hiller'</span>;
0047 myui.email = <span class="string">'thomas.hiller[at]leibniz-liag.de'</span>;
0048 myui.fontsize = 10;
Expand Down
4 changes: 2 additions & 2 deletions doc/nucleus/NUCLEUSmod/NUCLEUSmod_createPanelNMR.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,14 +175,14 @@ <h2><a name="_source"></a>SOURCE CODE <a href="#_top"><img alt="^" border="0" sr
0105 <span class="comment">%% noise &amp; porosity</span>
0106 gui.text_handles.noise = uicontrol(<span class="string">'Parent'</span>,gui.panels.nmr.HBox4,<span class="keyword">...</span>
0107 <span class="string">'Style'</span>,<span class="string">'text'</span>,<span class="string">'FontSize'</span>,myui.fontsize,<span class="string">'HorizontalAlignment'</span>,<span class="string">'center'</span>,<span class="keyword">...</span>
0108 <span class="string">'String'</span>,<span class="string">'add noise [%]'</span>);
0108 <span class="string">'String'</span>,<span class="string">'add noise'</span>);
0109 tstr = [<span class="string">'&lt;HTML&gt;Set NMR data noise.&lt;br&gt;&lt;br&gt;'</span>,<span class="keyword">...</span>
0110 <span class="string">'&lt;u&gt;Hint:&lt;/u&gt;&lt;br&gt;'</span>,<span class="keyword">...</span>
0111 <span class="string">'You do not need to press RUN to add noise to the NMR signals.&lt;br&gt;'</span>,<span class="keyword">...</span>
0112 <span class="string">'The raw NMR signals are stored internally and the noise is&lt;br&gt;'</span>,<span class="keyword">...</span>
0113 <span class="string">'applied instantaneously.&lt;br&gt;&lt;br&gt;'</span>,<span class="keyword">...</span>
0114 <span class="string">'&lt;u&gt;Default value:&lt;/u&gt;&lt;br&gt;'</span>,<span class="keyword">...</span>
0115 <span class="string">'&lt;b&gt;0 %&lt;/b&gt;&lt;br&gt;'</span>];
0115 <span class="string">'&lt;b&gt;0&lt;/b&gt;&lt;br&gt;'</span>];
0116 gui.edit_handles.noise = uicontrol(<span class="string">'Parent'</span>,gui.panels.nmr.HBox4,<span class="keyword">...</span>
0117 <span class="string">'Style'</span>,<span class="string">'edit'</span>,<span class="string">'String'</span>,num2str(data.nmr.noise),<span class="string">'FontSize'</span>,myui.fontsize,<span class="keyword">...</span>
0118 <span class="string">'UserData'</span>,struct(<span class="string">'Tooltipstr'</span>,tstr,<span class="string">'defaults'</span>,[data.nmr.noise 1 1]),<span class="keyword">...</span>
Expand Down
Loading

0 comments on commit 867b874

Please sign in to comment.