Merge pull request nasa#81 from mathworks/master

Split S-function code to allow for embedded code generation.

Author: GRC-RHC-Sim

Trunk/TMATS_Library/Lib_Turbo_Burner_TMATS_new.slx

@@ -8,6 +8,10 @@
         name(ii)= '_';
     elseif strcmp(name(ii), '\o')
         name(ii)= '';
+    elseif strcmp(name(ii), ' ')
+        name(ii)= '_';
+    elseif strcmp(name(ii), sprintf('\n'))
+        name(ii)= '_';
     end
     ii= ii + 1;
 end;

Trunk/TMATS_Library/Lib_Turbo_Compressor_TMATS_new.slx

@@ -9,9 +9,7 @@
 #define S_FUNCTION_NAME  Ambient_TMATS
 #define S_FUNCTION_LEVEL 2
 #include "simstruc.h"
-#include "constants_TMATS.h"
-#include "functions_TMATS.h"
-#include <math.h>
+#include "types_TMATS.h"
 
 #define X_A_AltVec_p(S)      ssGetSFcnParam(S,0)
 #define T_A_TsVec_p(S)       ssGetSFcnParam(S,1)
@@ -23,10 +21,18 @@
 #define AFARc_p(S)           ssGetSFcnParam(S,7)
 #define BN_p(S)              ssGetSFcnParam(S,8)
 #define NPARAMS 9
+#define NERRORS 5
 
-/* create enumeration for Iwork */
-typedef enum {Er1 = 0, Er2, Er3, Er4, Er5, NUM_IWORK}IWorkIdx;
+extern void Ambient_TMATS_body(real_T *y, const real_T *u, const AmbientStruct* prm);
 
+#define MDL_SET_WORK_WIDTHS
+#if defined(MDL_SET_WORK_WIDTHS) && defined(MATLAB_MEX_FILE)
+static void mdlSetWorkWidths(SimStruct *S)
+{
+    const char_T *rtParamNames[] = {"X_A_AltVec", "T_A_TsVec", "T_A_PsVec", "X_A_FARVec", "Y_A_TVec", "T_A_RtArray", "T_A_gammaArray", "AFARc"};
+    ssRegAllTunableParamsAsRunTimeParams(S, rtParamNames);
+}
+#endif
 
 static void mdlInitializeSizes(SimStruct *S)
 {
@@ -37,8 +43,15 @@ static void mdlInitializeSizes(SimStruct *S)
         return;
     }
 
-    for (i = 0; i < NPARAMS; i++)
-        ssSetSFcnParamTunable(S, i, 0);
+    for (i = 0; i < NPARAMS; i++) {
+        if (i != 8)
+            ssSetSFcnParamTunable(S, i, 1);
+        else
+            ssSetSFcnParamTunable(S, i, 0);
+    }
+
+    ssSetOptions(S, SS_OPTION_WORKS_WITH_CODE_REUSE |
+                    SS_OPTION_USE_TLC_WITH_ACCELERATOR);
 
     ssSetNumContStates(S, 0);
     ssSetNumDiscStates(S, 0);
@@ -53,7 +66,7 @@ static void mdlInitializeSizes(SimStruct *S)
 
     ssSetNumSampleTimes(S, 1);
     ssSetNumRWork(S, 0);
-    ssSetNumIWork(S, NUM_IWORK);
+    ssSetNumIWork(S, NERRORS);
     ssSetNumPWork(S, 0);
     ssSetNumModes(S, 0);
     ssSetNumNonsampledZCs(S, 0);
@@ -82,166 +95,61 @@ static void mdlStart(SimStruct *S)
 
 static void mdlOutputs(SimStruct *S, int_T tid)
 {
-    /*--------parameters defined in S-function block--------*/
-    const real_T AFARc              = *mxGetPr(AFARc_p(S));
-    
-    /*-------- vector & array data -------*/
-    const real_T *X_A_AltVec        = mxGetPr(X_A_AltVec_p(S));
-    const real_T *T_A_TsVec         = mxGetPr(T_A_TsVec_p(S));
-    const real_T *T_A_PsVec         = mxGetPr(T_A_PsVec_p(S));
-    const real_T *X_A_FARVec        = mxGetPr(X_A_FARVec_p(S));
-    const real_T *T_A_RtArray       = mxGetPr(T_A_RtArray_p(S));
-    const real_T *Y_A_TVec          = mxGetPr(Y_A_TVec_p(S));
-    const real_T *T_A_gammaArray    = mxGetPr(T_A_gammaArray_p(S));
-    
-    /*------get dimensions of parameter arrays-------*/
-    const int_T A   = mxGetNumberOfElements(X_A_AltVec_p(S));
-    const int_T B   = mxGetNumberOfElements(X_A_FARVec_p(S));
-    const int_T C   = mxGetNumberOfElements(Y_A_TVec_p(S));
-    
-    /*---------Define Inputs--------*/
+    /* Input and output vectors */
     const real_T *u  = (const real_T*) ssGetInputPortSignal(S,0);
 
-    double AltIn     = u[0];     /* Altitude(ft) 	*/
-    double dTempIn   = u[1];     /* delta Temperature [degF] 	*/
-    double MNIn      = u[2];     /* Mach Number (frac) 	*/
-    
-    real_T *y  = (real_T *)ssGetOutputPortRealSignal(S,0);  /* Output Array */
-    
-    /*--------Define Constants-------*/
-    double PsOut, TsOut, TtOut, PtOut, VengOut, TsStDayOut, Vsound;
-    double Ttg, Ptg, Vg, Vsg, MNg, Sout, htg, gammasg, Rs, Rt;
-    double hs, htOut, Test; 
-    double er, er_old, erthr, Ptg_new, Ptg_old, FAR, FAROut;
-    int iter, maxiter;
-    
-    int interpErr = 0;
+    real_T *y  = (real_T *)ssGetOutputPortRealSignal(S,0);
 
-
-    
-    /* ------- get strings -------------- */
-    char * BlkNm;
+    /* Block name buffer length and string read status */
     int_T buflen;
     int_T status;
-    
+
+    /* Block mask parameter struct */
+    AmbientStruct ambientStruct;
+    ambientStruct.AFARc              = *mxGetPr(AFARc_p(S));
+    /* Vector & array data */
+    ambientStruct.X_A_AltVec        = mxGetPr(X_A_AltVec_p(S));
+    ambientStruct.T_A_TsVec         = mxGetPr(T_A_TsVec_p(S));
+    ambientStruct.T_A_PsVec         = mxGetPr(T_A_PsVec_p(S));
+    ambientStruct.X_A_FARVec        = mxGetPr(X_A_FARVec_p(S));
+    ambientStruct.T_A_RtArray       = mxGetPr(T_A_RtArray_p(S));
+    ambientStruct.Y_A_TVec          = mxGetPr(Y_A_TVec_p(S));
+    ambientStruct.T_A_gammaArray    = mxGetPr(T_A_gammaArray_p(S));
+    /* Dimensions of parameter arrays */
+    ambientStruct.A   = mxGetNumberOfElements(X_A_AltVec_p(S));
+    ambientStruct.B   = mxGetNumberOfElements(X_A_FARVec_p(S));
+    ambientStruct.C   = mxGetNumberOfElements(Y_A_TVec_p(S));
+        
+    ambientStruct.IWork             = ssGetIWork(S);
+
     /* Get name of block from dialog parameter (string) */
     buflen = mxGetN(BN_p(S))*sizeof(mxChar)+1;
-    BlkNm = mxMalloc(buflen);
-    status = mxGetString(BN_p(S), BlkNm, buflen);
-    
-    FAR = AFARc;
-    
-    Rt = interp1Ac(X_A_FARVec,T_A_RtArray,FAR,B,&interpErr);
-    if (interpErr == 1 && ssGetIWork(S)[Er1] == 0){
-        printf("Warning in %s, Error calculating Rt. Vector definitions may need to be expanded.\n", BlkNm);
-        ssSetIWorkValue(S,Er1,1);
-    }
-    
-    Rs = Rt;
-    
-    /*  Static Temperature */
-    TsStDayOut = interp1Ac(X_A_AltVec,T_A_TsVec,AltIn,A,&interpErr);
-    if (interpErr == 1 && ssGetIWork(S)[Er2] == 0){
-        printf("Warning in %s, Error calculating TsStDayOut. Vector definitions may need to be expanded.\n", BlkNm);
-        ssSetIWorkValue(S,Er2,1);
-    }
-    TsOut = TsStDayOut + dTempIn;
-    
-    /* Static Pressure*/
-    PsOut = interp1Ac(X_A_AltVec,T_A_PsVec,AltIn,A,&interpErr);
-    if (interpErr == 1 && ssGetIWork(S)[Er3] == 0){
-        printf("Warning in %s, Error calculating PsOut. Vector definitions may need to be expanded.\n", BlkNm);
-        ssSetIWorkValue(S,Er3,1);
-    }
-    
-    /* Calc output entropy */
-    Sout = pt2sc(PsOut, TsOut, FAR);
-    /* Determine Static enthalpy */
-    hs = t2hc(TsOut,FAR);
-    
-    /* Pt guess */
-    /*------ Total Temperature ---------*/
-    Ttg = TsOut * (1+MNIn*MNIn*(C_GAMMA-1)/2);
-    /*------ Total Pressure ---------*/
-    Ptg = PsOut*divby((powT((TsOut*divby(Ttg)),(C_GAMMA*divby(C_GAMMA-1)))));
-    
-    /* calculate total temperature */
-    Ttg = sp2tc(Sout,Ptg,FAR);
-    /* calculate total enthalpy */
-    htg = t2hc(Ttg,FAR);
-    /* calculate velocity */
-    Vg = sqrtT(2 * (htg - hs)*C_GRAVITY*JOULES_CONST);
-    
-    gammasg = interp2Ac(X_A_FARVec,Y_A_TVec,T_A_gammaArray,FAR,TsOut,B,C,&interpErr);
-    if (interpErr == 1 && ssGetIWork(S)[Er4] == 0){
-        printf("Warning in %s, Error calculating iteration gammasg. Vector definitions may need to be expanded.\n", BlkNm);
-        ssSetIWorkValue(S,Er4,1);
-    }
-    Vsg = sqrtT(gammasg*Rs*TsOut*C_GRAVITY*JOULES_CONST);
-    MNg = Vg*divby(Vsg);
-    er = MNIn - MNg;
-    Ptg_new = Ptg + 0.05;
-    maxiter = 15;
-    iter = 0;
-    erthr = 0.001;
-    
-    while (fabs(er) > erthr && iter < maxiter) {
-        er_old = er;
-        Ptg_old = Ptg;
-        if(fabs(Ptg - Ptg_new) < 0.03)
-            Ptg = Ptg + 0.05;
-        else
-            Ptg = Ptg_new;
-        
-        /* calculate Total emperature */
-        Ttg = sp2tc(Sout,Ptg,FAR);
-        /* calculate total enthalpy */
-        htg = t2hc(Ttg,FAR);
-        /* calculate velocity */
-        Vg = sqrtT(2 * (htg - hs)*C_GRAVITY*JOULES_CONST);
-        
-        Vsg = sqrtT(gammasg*Rs*TsOut*C_GRAVITY*JOULES_CONST);
-        MNg = Vg*divby(Vsg);
-        er = MNIn - MNg;
-        if (fabs(er) > erthr) {
-            /* determine next guess pressure by secant algorithm */
-            Ptg_new = Ptg - er *(Ptg - Ptg_old)*divby(er - er_old);
-        }
-        iter = iter + 1;
-    }
-    if (iter == maxiter && ssGetIWork(S)[Er5]==0 ){
-        printf("Warning in %s, Error calculating Pt at input MN. There may be error in output pressure\n", BlkNm);
-        ssSetIWorkValue(S,Er5,1);
-    }
-    
-    htOut = htg;
-    TtOut = Ttg;
-    PtOut = Ptg;
-    
-    /*---- Engine Velocity ---------*/
-    Vsound = Vsg;
-    VengOut = Vsound * MNIn;
-    
-    FAROut = FAR;
+    ambientStruct.BlkNm = mxMalloc(buflen);
+    status = mxGetString(BN_p(S), ambientStruct.BlkNm, buflen);
 
-    Test = divby(dTempIn);
-    
-    /*------Assign output values------------*/
-    y[0] = htOut;      /* Total enthalpy */
-    y[1] = TtOut;      /* Total Temperature [degR] */
-    y[2] = PtOut;      /* Total Pressure [psia] */
-    y[3] = FAROut;     /* Fuel to Air Ratio */
-    y[4] = PsOut;      /* Static Pressure [psia] */
-    y[5] = TsOut;      /* Static Temperature [degR] */
-    y[6] = VengOut;    /* Engine Velocity [ft/sec] */
-    y[7] = Test;       /* Test signal */
-    
+    /* Perform core block calculations */
+    Ambient_TMATS_body(y, u, &ambientStruct);
 }
 
 static void mdlTerminate(SimStruct *S)
 {
 }
 
+#define MDL_RTW
+static void mdlRTW(SimStruct *S)
+{
+    if (!ssWriteRTWWorkVect(S, "IWork", 1 /* nNames */,
+                            "Errors", 
+                            ssGetNumIWork(S))) {
+        return;
+    }
+    /*
+      This registration of the error code symbols "Er1, etc." 
+			allows tlc to call 
+			LibBlockIWork(Er1,[...])
+     */
+
+}
 #ifdef  MATLAB_MEX_FILE    /* Is this file being compiled as a MEX-file? */
 #include "simulink.c"      /* MEX-file interface mechanism */
 #else

Trunk/TMATS_Library/Lib_Turbo_Nozzle_TMATS_new.slx

@@ -0,0 +1,70 @@
+%% File : Ambient_TMATS.tlc
+%%
+%% Description: 
+%%   Simulink Coder TLC Code Generation file for Ambient_TMATS
+%%
+%implements Ambient_TMATS "C"
+
+%% Function: BlockTypeSetup ===============================================
+%%
+%function BlockTypeSetup(block, system) void
+    %%
+    %% The Target Language must be C
+    %if ::GenCPP==1
+    %<LibReportFatalError("This S-Function generated by the Legacy Code Tool must be only used with the C Target Language")>
+    %endif
+
+    %<LibAddToCommonIncludes("types_TMATS.h")>
+
+    %<SLibAddToStaticSources("Ambient_TMATS_body.c")>
+
+    %openfile forwardDecls
+      extern void Ambient_TMATS_body(double *y, const double *u, const AmbientStruct* prm);
+      AmbientStruct ambientStruct;
+    %closefile forwardDecls
+
+    %assign srcFile = LibGetModelDotCFile()
+    %<LibSetSourceFileSection(srcFile, "Definitions", forwardDecls)>
+
+%endfunction
+
+%% Function: BlockInstanceSetup ===========================================
+%%
+%function BlockInstanceSetup(block, system) void
+    %%
+    %<LibBlockSetIsExpressionCompliant(block)>
+%endfunction
+
+%% Function: Outputs ======================================================
+%%
+%function Outputs(block, system) Output
+    %%
+    ambientStruct.AFARc               = %<LibBlockParameter(AFARc,"","",0)>;
+    ambientStruct.X_A_AltVec          = (double*)(%<LibBlockParameterBaseAddr(X_A_AltVec)>);
+    ambientStruct.T_A_TsVec           = (double*)(%<LibBlockParameterBaseAddr(T_A_TsVec)>);
+    ambientStruct.T_A_PsVec           = (double*)(%<LibBlockParameterBaseAddr(T_A_PsVec)>);
+    ambientStruct.X_A_FARVec          = (double*)(%<LibBlockParameterBaseAddr(X_A_FARVec)>);
+    ambientStruct.T_A_RtArray         = (double*)(%<LibBlockParameterBaseAddr(T_A_RtArray)>);
+    ambientStruct.Y_A_TVec            = (double*)(%<LibBlockParameterBaseAddr(Y_A_TVec)>);
+    ambientStruct.T_A_gammaArray      = (double*)(%<LibBlockParameterBaseAddr(T_A_gammaArray)>);
+    ambientStruct.A                   = %<LibBlockParameterSize(X_A_AltVec)[1]>;
+    ambientStruct.B                   = %<LibBlockParameterSize(X_A_FARVec)[1]>;
+    ambientStruct.C                   = %<LibBlockParameterSize(Y_A_TVec)[1]>;
+
+    ambientStruct.IWork               = &%<LibBlockIWork(Errors,"","",0)>;
+    ambientStruct.BlkNm               = "%<LibGetFormattedBlockPath(block)>";
+
+    %assign y_ptr = LibBlockOutputSignalAddr(0, "", "", 0)
+    %assign y_dataType = LibBlockOutputSignalDataTypeName(0,"")
+
+    %assign u_ptr = LibBlockInputSignalAddr(0, "", "", 0)
+    %assign u_dataType = LibBlockInputSignalDataTypeName(0,"")
+
+    %%
+    Ambient_TMATS_body((%<y_dataType>*)%<y_ptr>,\ 
+                       (%<u_dataType>*)%<u_ptr>,\ 
+                        &ambientStruct);
+    %%
+%endfunction
+
+%% [EOF]