Correct numbers of variables, ticket:4072

Index 0 of real vars is the first state, not reserved.
Moreover inputs and outputs are already covered by alg vars and states.

Author: rfranke

Compiler/Template/CodegenCpp.tpl

@@ -8961,9 +8961,8 @@ template numRealvars(ModelInfo modelInfo)
 ::=
 match modelInfo
 case MODELINFO(varInfo=VARINFO(__)) then
-//the index 0 is reserved for undefined references
 <<
-<%intAdd(1, intAdd(varInfo.numOptimizeFinalConstraints, intAdd(varInfo.numOptimizeConstraints, intAdd(varInfo.numOutVars, intAdd(varInfo.numInVars ,intAdd(intMul(2,varInfo.numStateVars),intAdd(varInfo.numAlgVars,intAdd(varInfo.numParams,varInfo.numDiscreteReal))))))))
+<%intAdd(intMul(2,varInfo.numStateVars),intAdd(varInfo.numAlgVars,intAdd(varInfo.numParams,varInfo.numDiscreteReal)))
 %>
 >>
 end numRealvars;
@@ -8983,29 +8982,26 @@ template numIntvars(ModelInfo modelInfo)
 ::=
 match modelInfo
 case MODELINFO(varInfo=VARINFO(__)) then
-//the index 0 is reserved for undefined references
 <<
-<%intAdd(1, intAdd(varInfo.numIntAlgVars,varInfo.numIntParams))%>
+<%intAdd(varInfo.numIntAlgVars,varInfo.numIntParams)%>
 >>
 end numIntvars;
 
 template numBoolvars(ModelInfo modelInfo)
 ::=
 match modelInfo
 case MODELINFO(varInfo=VARINFO(__)) then
-//the index 0 is reserved for undefined references
 <<
-<%intAdd(1, intAdd(varInfo.numBoolAlgVars,varInfo.numBoolParams))%>
+<%intAdd(varInfo.numBoolAlgVars,varInfo.numBoolParams)%>
 >>
 end numBoolvars;
 
 template numStringvars(ModelInfo modelInfo)
 ::=
 match modelInfo
 case MODELINFO(varInfo=VARINFO(__)) then
-//the index 0 is reserved for undefined references
 <<
-<%intAdd(1, intAdd(varInfo.numStringAlgVars,varInfo.numStringParamVars))%>
+<%intAdd(varInfo.numStringAlgVars,varInfo.numStringParamVars)%>
 >>
 end numStringvars;
 

Compiler/Template/CodegenFMUCpp.tpl

@@ -556,7 +556,11 @@ template accessVarsFunctionFMU2(SimCode simCode, String direction, String modelS
         >>%>
       // convert negated aliases
       else switch (*vr) {
-        <%aliasVars |> var => accessVarFMU2(simCode, direction, var, offset); separator="\n"%>
+        <%aliasVars |> var => match var
+          case SIMVAR(aliasvar=NEGATEDALIAS()) then
+            accessVarFMU2(simCode, direction, var, offset)
+          else ''
+          end match; separator="\n"%>
         default:
           throw std::invalid_argument("<%direction%><%typeName%> with wrong value reference " + omcpp::to_string(*vr));
       }

SimulationRuntime/cpp/Core/System/SimVars.cpp

@@ -47,8 +47,12 @@ void SimVars::create(size_t dim_real, size_t dim_int, size_t dim_bool, size_t di
 	if (_dim_real + _dim_int + _dim_bool > _dim_pre_vars)
 		throw std::runtime_error("Wrong pre variable size");
 	//allocate memory for all model variables
-	if (dim_string > 0)
+	if (dim_string > 0) {
 		_string_vars = new string[dim_string];
+	}
+	else {
+		_string_vars = NULL;
+	}
 	if (dim_bool > 0) {
 		_bool_vars = (bool*)alignedMalloc(sizeof(bool) * dim_bool, 64);
 		_pre_bool_vars = (bool*)alignedMalloc(sizeof(bool) * dim_bool, 64);