Skip to content

Commit 8a9a628

Browse files
author
Taryn Black
committed
Clarified entrainment figure labels
1 parent cf8ab70 commit 8a9a628

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

entrainment3D.m

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
% entrainment3D ---does things---
99
%
1010
% Functions called: loadTimestep3D; pulsetitle
11-
% Last edit: Taryn Black, 11 April 2016
11+
% Last edit: Taryn Black, 15 April 2016
1212

1313
% Clear directory of appending files from previous processing attempts
1414
cd(savepath)
@@ -437,13 +437,13 @@
437437
'auto','color','w');
438438
axVol1 = subplot(2,1,1);
439439
plot(time,plumevolume)
440-
title(axVol1,{sprintf('%s: Total plume volume',str)},...
440+
title(axVol1,{sprintf('Total plume volume\n%s',str)},...
441441
'FontWeight','bold')
442442
xlabel(axVol1,{'Time (s)'},'FontWeight','bold')
443443
ylabel(axVol1,{'Volume (m^3)'},'FontWeight','bold')
444444
axVol2 = subplot(2,1,2);
445445
plot(time(2:length(plumevolume)),diff(plumevolume))
446-
title(axVol2,{sprintf('%s: Change in plume volume',str)},...
446+
title(axVol2,{sprintf('Change in plume volume\n%s',str)},...
447447
'FontWeight','bold')
448448
xlabel(axVol2,{'Time (s)'},'FontWeight','bold')
449449
ylabel(axVol2,{'\DeltaVolume (m^3)'},'FontWeight','bold')
@@ -474,12 +474,13 @@
474474
'DisplayName','Entrainment');
475475
he3 = errorbar(time(2:end),avg_coeff(2:end),std_coeff(2:end),'k',...
476476
'LineWidth',3,'Marker','+','MarkerSize',10,...
477-
'DisplayName','Total Coefficient');
478-
tlCoeff1 = 'Plume-averaged entrainment/expansion efficiencies';
479-
tlCoeff2 = sprintf('%s, overall average entrainment = %.4f',str,mean(avg_entr(2:end)));
480-
title(axCoeff,{tlCoeff1;tlCoeff2},'FontWeight','bold')
477+
'DisplayName','Combined');
478+
tlCoeff1 = 'EEE averaged over full plume surface';
479+
tlCoeff2 = sprintf('%s',str);
480+
tlCoeff3 = sprintf('Spatiotemporally averaged entrainment = %.4f',mean(avg_entr(2:end)));
481+
title(axCoeff,{tlCoeff1;tlCoeff2;tlCoeff3},'FontWeight','bold')
481482
xlabel(axCoeff,'\bfTime (s)')
482-
ylabel(axCoeff,'\bfEfficiency Coefficient')
483+
ylabel(axCoeff,'\bfEEE')
483484
xlim(axCoeff,[0 time(end)+DT])
484485
ylim(axCoeff,[-1 1])
485486
line(xlim,[0 0],'color',[0.1 0.1 0.1],'LineWidth',0.5);
@@ -516,12 +517,13 @@
516517
'DisplayName','Entrainment');
517518
hje3 = errorbar(time(2:end),avg_jcoeff(2:end),std_jcoeff(2:end),'k',...
518519
'LineWidth',3,'Marker','+','MarkerSize',10,...
519-
'DisplayName','Total Coefficient');
520-
tlJCoeff1 = 'Jet region entrainment/expansion efficiencies';
521-
tlJCoeff2 = sprintf('%s, overall average entrainment = %.4f',str,mean(avg_jentr(2:end)));
522-
title(axJCoeff,{tlJCoeff1;tlJCoeff2},'FontWeight','bold')
520+
'DisplayName','Combined');
521+
tlJCoeff1 = 'EEE averaged over jet region';
522+
tlJCoeff2 = sprintf('%s',str);
523+
tlJCoeff3 = sprintf('Spatiotemporally averaged entrainment = %.4f',mean(avg_jentr(2:end)));
524+
title(axJCoeff,{tlJCoeff1;tlJCoeff2;tlJCoeff3},'FontWeight','bold')
523525
xlabel(axJCoeff,'\bfTime (s)')
524-
ylabel(axJCoeff,'\bfEntrainment/Expansion Coefficient')
526+
ylabel(axJCoeff,'\bfEEE')
525527
xlim(axJCoeff,[0 time(end)+DT])
526528
ylim(axJCoeff,[-1 1])
527529
line(xlim,[0 0],'color',[0.1 0.1 0.1],'LineWidth',0.5);
@@ -541,7 +543,7 @@
541543
'PaperPositionMode','auto','color','w');
542544
axMor = axes('Parent',figMorton,'box','on','FontSize',12);
543545
plot(axMor,time,e_Mconic)
544-
title(axMor,sprintf('%s: Morton conic entrainment coefficient',str),...
546+
title(axMor,sprintf('Morton entrainment coefficient\n%s',str),...
545547
'FontWeight','bold')
546548
xlabel(axMor,'\bfTime (s)')
547549
ylabel(axMor,'\bfCoefficient')

massFlux3D.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
% Detailed explanation goes here
1111
%
1212
% Functions called: loadTimestep3D; pulsetitle
13-
% Last edit: Taryn Black, 6 April 2016
13+
% Last edit: Taryn Black, 15 April 2016
1414

1515
% Clear directory of appending files from previous processing attempts
1616
cd(savepath)

0 commit comments

Comments
 (0)