Merge pull request #107 from chapman178/master

A few fixes

.gitignore

@@ -0,0 +1,5 @@
+*.mexw64
+*.mex
+*.bak
+*.slxc
+slprj/

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.3.1';
-TMATSdate = 'Jun-24-2020';
+TMATSver = '1.3.2';
+TMATSdate = 'Apr-02-2024';
 
 error = 0;
 InpMsg{1} = 'Install T-MATS matlab toolbox? Note: Installation will add MATLAB paths and generate MEX files.';
@@ -88,11 +88,11 @@ function Install_TMATS()
             make_file_TMATS;
 
             % return to the root directory
-            eval(['cd ' CurrDir]);
+            cd(CurrDir);
             disp('All mex files generated');
         catch ME
             % return to the root directory
-            eval(['cd ' CurrDir]);
+            cd(CurrDir);
             error = 1;
             % rethrow exception to generate error on screen
             throw(ME);
@@ -106,7 +106,7 @@ function Install_TMATS()
             fprintf(fid,'%%   Install_TMATS   - This subroutine installs T-MATS\n');
             fprintf(fid,'%%   Uninstall_TMATS - This subroutine uninstalls T-MATS\n');
             fclose(fid);
-            eval(['cd ' CurrDir]);
+            cd(CurrDir);
         end
 
 

Trunk/TMATS_Library/MEX/Nozzle_TMATS.c

@@ -150,7 +150,7 @@ static void mdlOutputs(SimStruct *S, int_T tid)
     /* Dimensions of parameter arrays */
     nozzleStruct.A   = mxGetNumberOfElements(Y_N_FARVec_p(S));
     nozzleStruct.B   = mxGetNumberOfElements(X_N_TtVec_p(S));
-    nozzleStruct.B1  = mxGetNumberOfElements(X_N_PEQPaVec_p(S));
+    nozzleStruct.BB  = mxGetNumberOfElements(X_N_PEQPaVec_p(S));
     nozzleStruct.C   = mxGetNumberOfElements(X_N_TtVecTG_p(S));
 
     nozzleStruct.IWork      = ssGetIWork(S);    

Trunk/TMATS_Library/MEX/Nozzle_TMATS.tlc

@@ -56,7 +56,7 @@
     nozzleStruct.X_N_TtVecTG         = (double*)(%<LibBlockParameterBaseAddr(X_N_TtVecTG)>);
     nozzleStruct.A                   = %<LibBlockParameterSize(Y_N_FARVec)[1]>;
     nozzleStruct.B                   = %<LibBlockParameterSize(X_N_TtVec)[1]>;
-    nozzleStruct.B1                  = %<LibBlockParameterSize(X_N_PEQPaVec)[1]>;
+    nozzleStruct.BB                  = %<LibBlockParameterSize(X_N_PEQPaVec)[1]>;
     nozzleStruct.C                   = %<LibBlockParameterSize(X_N_TtVecTG)[1]>;
 
     nozzleStruct.IWork               = &%<LibBlockIWork(Errors,"","",0)>;

Trunk/TMATS_Library/MEX/Nozzle_TMATS_body.c

@@ -205,7 +205,7 @@ void Nozzle_TMATS_body(double* y, const double* u, const NozzleStruct* prm)
     PQPaMap = PQPa;
 
     /* look up Flow Coefficient */
-    CdTh = interp1Ac(prm->X_N_PEQPaVec,prm->T_N_CdThArray,PQPaMap,prm->B1,&interpErr);
+    CdTh = interp1Ac(prm->X_N_PEQPaVec,prm->T_N_CdThArray,PQPaMap,prm->BB,&interpErr);
     if (interpErr == 1 && *(prm->IWork+Er9)==0){
 #ifdef MATLAB_MEX_FILE
         printf("Warning in %s, Error calculating CdTh. Vector definitions may need to be expanded.\n", prm->BlkNm);
@@ -348,7 +348,7 @@ void Nozzle_TMATS_body(double* y, const double* u, const NozzleStruct* prm)
 
     /* look up Thrust and velocity coefficients */
     if (prm->CfgEn < 0.5){
-        Cv = interp1Ac(prm->X_N_PEQPaVec,prm->T_N_CvArray,PQPaMap,prm->B1,&interpErr);
+        Cv = interp1Ac(prm->X_N_PEQPaVec,prm->T_N_CvArray,PQPaMap,prm->BB,&interpErr);
         if (interpErr == 1 && *(prm->IWork+Er15)==0){
 #ifdef MATLAB_MEX_FILE
             printf("Warning in %s, Error calculating Cv. Vector definitions may need to be expanded.\n", prm->BlkNm);
@@ -358,7 +358,7 @@ void Nozzle_TMATS_body(double* y, const double* u, const NozzleStruct* prm)
         Cfg = 1;
     }
     else {
-        Cfg = interp1Ac(prm->X_N_PEQPaVec,prm->T_N_CfgArray,PQPaMap,prm->B1,&interpErr);
+        Cfg = interp1Ac(prm->X_N_PEQPaVec,prm->T_N_CfgArray,PQPaMap,prm->BB,&interpErr);
         if (interpErr == 1 && *(prm->IWork+Er16)==0){
 #ifdef MATLAB_MEX_FILE
             printf("Warning in %s, Error calculating Cfg. Vector definitions may need to be expanded.\n", prm->BlkNm);

Trunk/TMATS_Library/MEX/ValvePHY_TMATS.c

@@ -113,7 +113,7 @@ static void mdlOutputs(SimStruct *S, int_T tid)
     valvePHYStruct.T_V_gamma_array           = mxGetPr(T_V_gamma_array_p(S));
     /* Dimensions of parameter arrays */
     valvePHYStruct.A1  = mxGetNumberOfElements(X_V_FAR_vec_p(S));
-    valvePHYStruct.B1  = mxGetNumberOfElements(Y_V_Tt_vec_p(S));
+    valvePHYStruct.BB  = mxGetNumberOfElements(Y_V_Tt_vec_p(S));
 
     valvePHYStruct.IWork      = ssGetIWork(S);
 

Trunk/TMATS_Library/MEX/ValvePHY_TMATS.tlc

@@ -47,7 +47,7 @@
     valvePHYStruct.Y_V_Tt_vec          = (double*)(%<LibBlockParameterBaseAddr(Y_V_Tt_vec)>);
     valvePHYStruct.T_V_gamma_array     = (double*)(%<LibBlockParameterBaseAddr(T_V_gamma_array)>);
     valvePHYStruct.A1                  = %<LibBlockParameterSize(X_V_FAR_vec)[1]>;
-    valvePHYStruct.B1                  = %<LibBlockParameterSize(Y_V_Tt_vec)[1]>;
+    valvePHYStruct.BB                  = %<LibBlockParameterSize(Y_V_Tt_vec)[1]>;
 
     valvePHYStruct.IWork               = &%<LibBlockIWork(Errors,"","",0)>;
     valvePHYStruct.BlkNm               = "%<LibGetFormattedBlockPath(block)>";

Trunk/TMATS_Library/MEX/ValvePHY_TMATS_body.c

@@ -51,7 +51,7 @@ void ValvePHY_TMATS_body(double *y, const double *u, const ValvePHYStruct* prm)
             #endif
             *(prm->IWork+Er2) = 1;
         }
-        gamb = interp2Ac(prm->X_V_FAR_vec,prm->Y_V_Tt_vec,prm->T_V_gamma_array,FARcmfpIn,TtmfpIn,prm->A1,prm->B1,&interpErr);
+        gamb = interp2Ac(prm->X_V_FAR_vec,prm->Y_V_Tt_vec,prm->T_V_gamma_array,FARcmfpIn,TtmfpIn,prm->A1,prm->BB,&interpErr);
         if (interpErr == 1 && *(prm->IWork+Er3)==0){
             #ifdef MATLAB_MEX_FILE
             printf("Warning in %s, Error calculating gamb. Vector definitions may need to be expanded.\n", prm->BlkNm);
@@ -62,7 +62,7 @@ void ValvePHY_TMATS_body(double *y, const double *u, const ValvePHYStruct* prm)
 
         /* determine static pressure at the exit plane (entering fan); */
         /* assume bypass flow >> bleed flow */
-        Pe = calc_Pstatic(PtbyIn,TtbyIn,WbyIn,prm->s_V_Ae_byp,prm->X_V_FAR_vec,prm->T_V_Rt_vec,prm->Y_V_Tt_vec,prm->T_V_gamma_array,FARcbyIn,prm->A1,prm->B1);
+        Pe = calc_Pstatic(PtbyIn,TtbyIn,WbyIn,prm->s_V_Ae_byp,prm->X_V_FAR_vec,prm->T_V_Rt_vec,prm->Y_V_Tt_vec,prm->T_V_gamma_array,FARcbyIn,prm->A1,prm->BB);
 
         /* compute exit to critical area ratio */
         Me = sqrtT(2*divby(gamb-1)*(powT(Pe*divby(PtmfpIn), (1-gamb)*divby(gamb))-1));

Trunk/TMATS_Library/MEX/types_TMATS.H

@@ -74,7 +74,7 @@ struct NozzleStruct {
 	/* Dimensions of parameter arrays */
     int A;
     int B;
-    int B1;
+    int BB;
     int C;
 };
 typedef struct NozzleStruct NozzleStruct;
@@ -265,7 +265,7 @@ struct ValvePHYStruct{
 
     /* Dimensions of parameter arrays */
     int A1;
-    int B1;
+    int BB;
 
 };
 typedef struct ValvePHYStruct ValvePHYStruct;

Trunk/TMATS_Library/MEX/types_TMATS.h

@@ -74,7 +74,7 @@ struct NozzleStruct {
 	/* Dimensions of parameter arrays */
     int A;
     int B;
-    int B1;
+    int BB;
     int C;
 };
 typedef struct NozzleStruct NozzleStruct;
@@ -265,7 +265,7 @@ struct ValvePHYStruct{
 
     /* Dimensions of parameter arrays */
     int A1;
-    int B1;
+    int BB;
 
 };
 typedef struct ValvePHYStruct ValvePHYStruct;

Trunk/Uninstall_TMATS.m

@@ -60,7 +60,7 @@ function Uninstall_TMATS()
                 fid = fopen('Contents.m');
                 fclose(fid);
                 delete('Contents.m');
-                eval(['cd ' CurrDir]);
+                cd(CurrDir);
             end
 
             disp('T-MATS path removal complete.');