Re-sync fork with main repo updates.

Author: jasonwhit

Trunk/Install_TMATS.m

@@ -3,8 +3,8 @@ function Install_TMATS()
 
 % TMATSver and date must remain in the listed form for the ver command to work
 % properly.
-TMATSver = '1.1.3.34';
-TMATSdate = 'Jun-20-2017';
+TMATSver = '1.1.3.39';
+TMATSdate = 'Aug-28-2017';
 
 error = 0;
 TMATSInstallmsg = 'Install T-MATS matlab toolbox? Note: Installation will add MATLAB paths and generate MEX files.';

Trunk/TMATS_Examples/Example_GasTurbine_Dyn/Bus/Solver_Bus.mat

@@ -25,26 +25,11 @@ function GasTurbine_Dyn_Example_cleanup(MWS)
 
     % remove all of the directories that were added to the path
     Pth1 = strcat(top_level,pathOperator,'SimSetup');
-    Pth2 = strcat(top_level,pathOperator,'External_Effectors');
-    Pth3 = strcat(top_level,pathOperator,'Plants');
-    Pth4 = strcat(top_level,pathOperator,'Bus');
+
     perm1 = ~isempty(strfind(path,Pth1));  % determine if path is already defined
-    perm2 = ~isempty(strfind(path,Pth2));  % determine if path is already defined
-    perm3 = ~isempty(strfind(path,Pth3));  % determine if path is already defined
-    perm4 = ~isempty(strfind(path,Pth4));  % determine if path is already defined
     if perm1
     eval(['rmpath ',Pth1])
     end
-    if perm2
-    eval(['rmpath ',Pth2])
-    end
-    if perm3
-    eval(['rmpath ',Pth3])
-    end
-    if perm4
-    eval(['rmpath ',Pth4])
-    end
-    
     % end
 catch
     disp('Unable to remove T-MATS Dynamic Gas Turbine example directories from the path.')

Trunk/TMATS_Examples/Example_GasTurbine_Dyn/Bus/setup_Bus.m

@@ -25,9 +25,6 @@
 
 %--------- add necessary subdirectories to current MATLAB path
 eval(['addpath ',MWS.top_level,POp,'SimSetup'])
-eval(['addpath ',MWS.top_level,POp,'External_Effectors'])
-eval(['addpath ',MWS.top_level,POp,'Plants'])
-eval(['addpath ',MWS.top_level,POp,'Bus']) 
 
 %------ run various setup files to get tables & constants ---------
 MWS = setup_Solve_temp(MWS);	% develops variables for the iterative solver
@@ -38,15 +35,13 @@
 MWS = setup_HPT(MWS);           % develops variables for HPT
 MWS = setup_Burner(MWS);        % develops variables for Burner
 MWS = setup_Duct(MWS);          % develops variables for Duct
+MWS = setup_Inlet(MWS);         % develops variables for Inlet
 
 % if no output is specified, then just assign MWS to the workspace
 if(nargout == 0)
     assignin('base','MWS',MWS);
 end
 
-%------ run setup files to define the bus ---------
-evalin('base','setup_Bus');
-
 % open template
 open_system('GasTurbine_Dyn_Template.slx');
 

Trunk/TMATS_Examples/Example_GasTurbine_Dyn/External_Effectors/Nc_cntrller.slx

@@ -0,0 +1,40 @@
+TMATS.TDplot('GasTurbine_Dyn_Template');
+
+% ---------------------------------------------------------------
+% plot remaining itemts that do not appear with the TDplot command
+
+
+fontname = 'Helvetica';
+set(0,'defaultaxesfontname',fontname);
+set(0,'defaulttextfontname',fontname);
+
+% save figure settings
+Temp.set_old = get(0,'DefaultFigureWindowStyle');
+% set figure to place new figures into the same window
+set(0,'DefaultFigureWindowStyle','docked');
+
+% plot stability margins
+Temp.f = figure;
+set(Temp.f,'name','StbMrgn','numbertitle','off');
+plot(C_Data.SMavail.Time,C_Data.SMavail.Data )
+ylabel('Stability Margin, %')
+xlabel('Time, s')
+
+% plot additional engine items,  thrust and control inputs
+Temp.f = figure;
+set(Temp.f,'name','Cntrl,Thrst','numbertitle','off');
+subplot(3,1,1)
+plot(Fnet.Time,Fnet.Data)
+ylabel('Fnet, lbf')
+subplot(3,1,2)
+plot(Wf.Time,Wf.Data)
+ylabel('Wf, pps')
+subplot(3,1,3)
+plot(SFC.Time,SFC.Data)
+ylabel('SFC, (lbm/hr)/lbf' )
+xlabel('Time, s')
+
+%return settings
+set(0,'DefaultFigureWindowStyle',Temp.set_old);
+
+clear Temp

Trunk/TMATS_Examples/Example_GasTurbine_Dyn/GasTurbine_Dyn_Example_cleanup.m

@@ -11,7 +11,7 @@
 
 
  MWS.HPC.NcVec = [0.500 0.600 0.700 0.750 0.800 0.850 0.900 0.925...
-                   0.950 0.975 1.000 1.025 1.050 2];
+                   0.950 0.975 1.000 1.025 1.050];
 
  MWS.HPC.RlineVec = [    1.000    1.200    1.400    1.600    1.800    2.000...
                        2.200    2.400    2.600    2.800    3.000 ];
@@ -43,8 +43,6 @@
                     209.9986 210.5917 211.1029 211.5321 211.8825 212.1554...
                     212.3516 212.4735 212.5220 212.5227 212.5227;
                     216.6847 217.0279 217.3287 217.5860 217.8015 217.9767...
-                    218.1106 218.2041 218.2586 218.2739 218.2739 ;
-                    216.6847 217.0279 217.3287 217.5860 217.8015 217.9767...
                     218.1106 218.2041 218.2586 218.2739 218.2739];
 
 %========== eff = f(NcMap, RlineMap) ==================
@@ -73,8 +71,6 @@
                         0.8350 0.8364 0.8371 0.8370 0.8362 0.8346 0.8318...
                         0.8275 0.8217 0.8141 0.8049 ;
                         0.8202 0.8203 0.8201 0.8195 0.8185 0.8171 0.8152...
-                        0.8124 0.8088 0.8045 0.7992 ;
-                        0.8202 0.8203 0.8201 0.8195 0.8185 0.8171 0.8152...
                         0.8124 0.8088 0.8045 0.7992];
 
 %========== PR = f(NcMap, RlineMap) ==================
@@ -103,27 +99,24 @@
                         27.6439 27.0687 26.4522 25.7969 25.1052 24.3798...
                         23.6033 22.7614 21.8600 20.9058 19.9057 ;
                         28.4663 27.9667 27.4460 26.9054 26.3460 25.7690...
-                        25.1640 24.5225 23.8472 23.1399 22.4038 ;
-                        28.4663 27.9667 27.4460 26.9054 26.3460 25.7690...
                         25.1640 24.5225 23.8472 23.1399 22.4038];
 
 %------ scaler for corrected flow -------------
-MWS.HPC.s_Wc = 0.4953;
+MWS.HPC.s_Wc = 0.495342;
 
 %--------- scaler for pressure ratio ----------
-MWS.HPC.s_PR = 0.8636; 
+MWS.HPC.s_PR = 0.863640; 
 
 %--------- scaler for efficiency ----------  
-MWS.HPC.s_eff = 0.9977;
+MWS.HPC.s_eff = 0.997653;
 
 %--------- scaler for corrected HPC speed ----------
- MWS.HPC.s_Nc = 1/ 0.0001;
+ MWS.HPC.s_Nc = 10000;
 
- %--------- Define surge line ----------
+  %--------- Define surge line ----------
  MWS.HPC.WcMapSurge = [22.7411 31.7548 46.1066 56.7268 70.1448 89.376...
                        118.062 138.509 160.624 181.799 202.631 209.9986...
                        216.684 218.2739];
  MWS.HPC.PRMapSurge =[2.4769    3.4633    5.0821    6.3490    8.0021...  
                       10.4899   14.4564   17.4426   20.7403   23.8298...
-                      26.6962   27.6439   28.4663   28.6619];
- 
+                      26.6962   27.6439   28.4663   28.6619];