From 9a201720ccb3dc1b19879227aa9359c016cd5098 Mon Sep 17 00:00:00 2001 From: Jim Nutaro Date: Mon, 7 May 2012 00:46:36 +0000 Subject: [PATCH] Update to Adevs code generator for new simulation runtime git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@11856 f25d12d1-65f4-0310-ae8a-bbce733d8d8e --- .../susan_codegen/SimCode/CodegenAdevs.tpl | 37 ------------------- 1 file changed, 37 deletions(-) diff --git a/Compiler/susan_codegen/SimCode/CodegenAdevs.tpl b/Compiler/susan_codegen/SimCode/CodegenAdevs.tpl index 1a5c20d9319..90572ff8a72 100644 --- a/Compiler/susan_codegen/SimCode/CodegenAdevs.tpl +++ b/Compiler/susan_codegen/SimCode/CodegenAdevs.tpl @@ -244,49 +244,12 @@ match simCode case SIMCODE(modelInfo = MODELINFO(varInfo = vi as VARINFO(__))) then << #include "<%lastIdentOfPath(modelInfo.name)%>.h" - #include "modelica.h" #include "adevs_modelica_runtime.h" using namespace adevs; - #ifdef extraPolate - #undef extraPolate - #define extraPolate(v) v - #endif - - #ifdef check_discrete_values - #undef check_discrete_values - #define check_discrete_values(size,numValues) found_solution = 1 - #endif - - #define time timeValue - #define localData this - // This is used by the residual functions static <%lastIdentOfPath(modelInfo.name)%>* active_model; - // undefine initial() (orig. defn. in omc's simulation_runtime.h) - #ifdef initial - #undef initial - #endif - // Less, Greater, etc are positive if true, negative if false - #define Adevs_Less(exp1,exp2) ((exp2)-(exp1)) - #define Adevs_Greater(exp1,exp2) ((exp1)-(exp2)) - #define Adevs_LessEq(exp1,exp2) ((exp2)-(exp1)) - #define Adevs_GreaterEq(exp1,exp2) ((exp1)-(exp2)) - // True to false transitions occur at zero, - // False to true transitions at positive epsilon - #define ADEVS_ZEROCROSSING(index,expr) z[index] = expr-(!zc[index])*epsilon - #define ADEVS_RELATIONTOZC(var,exp1,exp2,index,OpSym) \ - if (0 <= index) { \ - if (zc[index] == -1) zc[index]=((exp1) OpSym (exp2)); \ - var=zc[index]; \ - } else var=((exp1) OpSym (exp2)) - #define ADEVS_SAVEZEROCROSS(var,exp1,exp2,index,OpSym) \ - if (0 <= index) { \ - if (zc[index] == -1) zc[index]=((exp1) OpSym (exp2)); \ - var=zc[index]; \ - } else var=((exp1) OpSym (exp2)) - <%makeExtraFunctionsAndRecords(simCode)%> <%makeBoundParams(simCode)%>