From de6d77277595b5c9b3d0c59d26bed06974081385 Mon Sep 17 00:00:00 2001 From: Kenneth Lausdahl Date: Thu, 5 Oct 2023 22:29:02 +0200 Subject: [PATCH] cleanup --- .../framework/fmi2/api/FmiBuilder.java | 4 + .../variables/InstanceVariableFmi3Api.java | 218 ++++++++---------- .../fmi2/api/mabl/variables/VarWrap.java | 22 ++ .../src/main/kotlin/Initializer.kt | 11 +- 4 files changed, 132 insertions(+), 123 deletions(-) create mode 100644 frameworks/fmi2api/src/main/java/org/intocps/maestro/framework/fmi2/api/mabl/variables/VarWrap.java diff --git a/frameworks/builder/src/main/java/org/intocps/maestro/framework/fmi2/api/FmiBuilder.java b/frameworks/builder/src/main/java/org/intocps/maestro/framework/fmi2/api/FmiBuilder.java index 563015fc..239a660c 100644 --- a/frameworks/builder/src/main/java/org/intocps/maestro/framework/fmi2/api/FmiBuilder.java +++ b/frameworks/builder/src/main/java/org/intocps/maestro/framework/fmi2/api/FmiBuilder.java @@ -771,6 +771,10 @@ interface Fmi3InstanceVariable extends FmiSimulationInstance { void enterInitializationMode(boolean toleranceDefined, double tolerance, double startTime, boolean stopTimeDefined, double stopTime); + void enterInitializationMode(Scope scope,FmiBuilder.BoolVariable toleranceDefined, FmiBuilder.DoubleVariable tolerance, FmiBuilder.DoubleVariable startTime, + FmiBuilder.BoolVariable stopTimeDefined, FmiBuilder.DoubleVariable stopTime); + void enterInitializationMode(FmiBuilder.BoolVariable toleranceDefined, FmiBuilder.DoubleVariable tolerance, FmiBuilder.DoubleVariable startTime, + FmiBuilder.BoolVariable stopTimeDefined, FmiBuilder.DoubleVariable stopTime); void exitInitializationMode(); void setupExperiment(Scope scope, DoubleVariable startTime, DoubleVariable endTime, BoolVariable endTimeDefined, diff --git a/frameworks/fmi2api/src/main/java/org/intocps/maestro/framework/fmi2/api/mabl/variables/InstanceVariableFmi3Api.java b/frameworks/fmi2api/src/main/java/org/intocps/maestro/framework/fmi2/api/mabl/variables/InstanceVariableFmi3Api.java index dd5dbf5a..f040c2b0 100644 --- a/frameworks/fmi2api/src/main/java/org/intocps/maestro/framework/fmi2/api/mabl/variables/InstanceVariableFmi3Api.java +++ b/frameworks/fmi2api/src/main/java/org/intocps/maestro/framework/fmi2/api/mabl/variables/InstanceVariableFmi3Api.java @@ -151,6 +151,7 @@ private ArrayVariableFmi2Api getIOBuffer(PType type) { return getBuffer(this.ioBuffer, type, "IO", modelDescriptionContext.valRefToSv.size(), getDeclaredScope()); } + @SuppressWarnings("unchecked") private ArrayVariableFmi2Api getSharedDerBuffer() { if (this.derSharedBuffer == null) { try { @@ -167,6 +168,7 @@ private ArrayVariableFmi2Api getSharedBuffer(PType type) { return this.getBuffer(this.sharedBuffer, type, "Share", 0, getDeclaredScope()); } + @SuppressWarnings("unchecked") private ArrayVariableFmi2Api createMDArrayRecursively(List arraySizes, PStm declaringStm, PStateDesignatorBase stateDesignator, PExpBase indexExp) { @@ -224,6 +226,8 @@ private ArrayVariableFmi2Api createBuffer(PType type, String prefix, int @Override public void setDebugLogging(List categories, boolean enableLogging) { + final String method = "setDebugLogging"; + AArrayInitializer loglevelsArrayInitializer = null; String arrayName = name + LOGLEVELS_POSTFIX; IMablScope scope = builder.getDynamicScope().getActiveScope(); @@ -238,16 +242,13 @@ public void setDebugLogging(List categories, boolean enableLogging) { LexIdentifier statusIdentifier = newAIdentifier(getEnvironmentName() + "_" + CATEGORY_STATUS); ALocalVariableStm callStm = newALocalVariableStm(newAVariableDeclaration(statusIdentifier, newAIntNumericPrimitiveType(), newAExpInitializer( - newACallExp(newAIdentifierExp(name), newAIdentifier("setDebugLogging"), + newACallExp(newAIdentifierExp(name), newAIdentifier(method), Arrays.asList(newABoolLiteralExp(enableLogging), MableAstFactory.newAIntLiteralExp(categories.size()), MableAstFactory.newAIdentifierExp(arrayName)))))); scope.add(arrayContent, callStm); - if (builder.getSettings().fmiErrorHandlingEnabled) { - FmiStatusErrorHandlingBuilder.generate(builder, "setDebugLogging", this, (IMablScope) scope, MablApiBuilder.Fmi3Status.FMI_ERROR, - MablApiBuilder.Fmi3Status.FMI_FATAL); - } + handleError(scope, method); } @Override @@ -269,15 +270,14 @@ private void setupExperiment(PExp startTime, PExp endTime, PExp endTimeDefined, } private void setupExperiment(FmiBuilder.Scope scope, PExp startTime, PExp endTime, PExp endTimeDefined, Double tolerance) { + final String method = "setupExperiment"; + AAssigmentStm stm = newAAssignmentStm(((IMablScope) scope).getFmiStatusVariable().getDesignator().clone(), - call(this.getReferenceExp().clone(), createFunctionName(FmiFunctionType.SETUPEXPERIMENT), new ArrayList<>( + call(this.getReferenceExp().clone(), method, new ArrayList<>( Arrays.asList(newABoolLiteralExp(tolerance != null), newARealLiteralExp(tolerance != null ? tolerance : 0d), startTime.clone(), endTimeDefined, endTime != null ? endTime.clone() : newARealLiteralExp(0d))))); scope.add(stm); - if (builder.getSettings().fmiErrorHandlingEnabled) { - FmiStatusErrorHandlingBuilder.generate(builder, "setupExperiment", this, (IMablScope) scope, MablApiBuilder.Fmi3Status.FMI_ERROR, - MablApiBuilder.Fmi3Status.FMI_FATAL); - } + handleError(scope, method); } @Override @@ -286,6 +286,46 @@ public void enterInitializationMode(boolean toleranceDefined, double tolerance, } + @Override + public void enterInitializationMode(FmiBuilder.Scope scope, boolean toleranceDefined, double tolerance, double startTime, + boolean stopTimeDefined, double stopTime) { + this.enterInitializationMode(builder.getDynamicScope(), VarWrap.wrap(toleranceDefined), VarWrap.wrap(tolerance), VarWrap.wrap(startTime), + VarWrap.wrap(stopTimeDefined), VarWrap.wrap(stopTime)); + + } + + @Override + public void enterInitializationMode(FmiBuilder.BoolVariable toleranceDefined, FmiBuilder.DoubleVariable tolerance, + FmiBuilder.DoubleVariable startTime, FmiBuilder.BoolVariable stopTimeDefined, FmiBuilder.DoubleVariable stopTime) { + enterInitializationMode(builder.getDynamicScope(), toleranceDefined, tolerance, startTime, stopTimeDefined, stopTime); + } + + @Override + public void enterInitializationMode(FmiBuilder.Scope scope, FmiBuilder.BoolVariable toleranceDefined, + FmiBuilder.DoubleVariable tolerance, FmiBuilder.DoubleVariable startTime, FmiBuilder.BoolVariable stopTimeDefined, + FmiBuilder.DoubleVariable stopTime) { + + final String method = "enterInitializationMode"; + + AAssigmentStm stm = newAAssignmentStm(((IMablScope) scope).getFmiStatusVariable().getDesignator().clone(), + call(this.getReferenceExp().clone(), method, toleranceDefined.getExp().clone(), tolerance.getExp().clone(), + startTime.getExp().clone(), stopTimeDefined.getExp().clone(), stopTime.getExp().clone())); + + scope.add(stm); + + handleError(scope, method); + } + + private void handleError(FmiBuilder.Scope scope, String method) { + handleError(scope, method, MablApiBuilder.Fmi3Status.FMI_ERROR, MablApiBuilder.Fmi3Status.FMI_FATAL); + } + + private void handleError(FmiBuilder.Scope scope, String method, MablApiBuilder.Fmi3Status... statusesToFail) { + if (builder.getSettings().fmiErrorHandlingEnabled) { + FmiStatusErrorHandlingBuilder.generate(builder, method, this, (IMablScope) scope, statusesToFail); + } + } + @Override public void exitInitializationMode() { this.exitInitializationMode(builder.getDynamicScope()); @@ -303,28 +343,18 @@ public void setupExperiment(FmiBuilder.Scope scope, double startTime, Doub this.setupExperiment(scope, newARealLiteralExp(startTime), newARealLiteralExp(endTime), newABoolLiteralExp(true), tolerance); } - // TODO: probably should return other things than ok also - @Override - public void enterInitializationMode(FmiBuilder.Scope scope, boolean toleranceDefined, double tolerance, double startTime, - boolean stopTimeDefined, double stopTime) { - PStm stm = - stateTransitionFunction(FmiFunctionType.ENTERINITIALIZATIONMODE, toleranceDefined, tolerance, startTime, stopTimeDefined, stopTime); - - scope.add(stm); - if (builder.getSettings().fmiErrorHandlingEnabled) { - FmiStatusErrorHandlingBuilder.generate(builder, "enterInitializationMode", this, (IMablScope) scope, MablApiBuilder.Fmi3Status.FMI_ERROR, - MablApiBuilder.Fmi3Status.FMI_FATAL); - } - } @Override public void exitInitializationMode(FmiBuilder.Scope scope) { - PStm stm = stateTransitionFunction(FmiFunctionType.EXITINITIALIZATIONMODE); + + final String method = "exitInitializationMode"; + + AAssigmentStm stm = + newAAssignmentStm(((IMablScope) scope).getFmiStatusVariable().getDesignator().clone(), call(this.getReferenceExp().clone(), method)); + scope.add(stm); - if (builder.getSettings().fmiErrorHandlingEnabled) { - FmiStatusErrorHandlingBuilder.generate(builder, "exitInitializationMode", this, (IMablScope) scope, MablApiBuilder.Fmi3Status.FMI_ERROR, - MablApiBuilder.Fmi3Status.FMI_FATAL); - } + + handleError(scope, method); } @Override @@ -384,44 +414,6 @@ private Map.Entry, FmiBuilder.DoubleVariable return Map.entry(getCurrentTimeFullStepVar(), getCurrentTimeVar()); } - private PStm stateTransitionFunction(FmiFunctionType type, boolean toleranceDefined, double tolerance, double startTime, boolean stopTimeDefined, - double stopTime) { - switch (type) { - case ENTERINITIALIZATIONMODE: - AAssigmentStm stm = newAAssignmentStm(((IMablScope) this.dynamicScope).getFmiStatusVariable().getDesignator().clone(), - call(this.getReferenceExp().clone(), createFunctionName(type), newABoolLiteralExp(toleranceDefined), - newARealLiteralExp(tolerance), newARealLiteralExp(startTime), newABoolLiteralExp(stopTimeDefined), - newARealLiteralExp(stopTime))); - return stm; - case EXITINITIALIZATIONMODE: - break; - case TERMINATE: - break; - default: - throw new RuntimeException("Attempting to call state transition function with non-state transition function type: " + type); - } - - - AAssigmentStm stm = newAAssignmentStm(((IMablScope) this.dynamicScope).getFmiStatusVariable().getDesignator().clone(), - call(this.getReferenceExp().clone(), createFunctionName(type))); - return stm; - } - - - private PStm stateTransitionFunction(FmiFunctionType type) { - switch (type) { - case EXITINITIALIZATIONMODE: - break; - case TERMINATE: - break; - default: - throw new RuntimeException("Attempting to call state transition function with non-state transition function type: " + type); - } - AAssigmentStm stm = newAAssignmentStm(((IMablScope) this.dynamicScope).getFmiStatusVariable().getDesignator().clone(), - call(this.getReferenceExp().clone(), createFunctionName(type))); - return stm; - } - @Override public List getPorts() { return ports; @@ -441,15 +433,16 @@ public List getPorts(int... valueReferences) { @Override public PortFmi3Api getPort(String name) { - return (PortFmi3Api) this.getPorts(name).get(0); + return this.getPorts(name).get(0); } @Override public PortFmi3Api getPort(int valueReference) { - return (PortFmi3Api) this.getPorts(valueReference).get(0); + return this.getPorts(valueReference).get(0); } //TODO: Move tentative buffer and global share buffer logic to its own module so that it is not coupled with the component logic? + @SuppressWarnings("unchecked") public Map> getTentative(IMablScope scope, String... names) { // Get filtered port values FmiBuilder.Port[] filteredPorts = this.ports.stream() @@ -498,6 +491,7 @@ public Map> get(FmiBuilder.Port Map> get(FmiBuilder.Scope scope, FmiBuilder.Port... ports) { @@ -575,10 +569,7 @@ public Map> get(FmiBuilder.Scope scope vrefBuf.getReferenceExp().clone(), newAUIntLiteralExp((long) e.getValue().size()), valBuf.getReferenceExp().clone())); scope.add(stm); - if (builder.getSettings().fmiErrorHandlingEnabled) { - FmiStatusErrorHandlingBuilder.generate(builder, createFunctionName(FmiFunctionType.GET, e.getValue().get(0)), this, - (IMablScope) scope, MablApiBuilder.Fmi3Status.FMI_ERROR, MablApiBuilder.Fmi3Status.FMI_FATAL); - } + handleError(scope, createFunctionName(FmiFunctionType.GET, e.getValue().get(0))); if (builder.getSettings().setGetDerivatives && type.equals(new ARealNumericPrimitiveType())) { derivativePortsToShare = getDerivatives(e.getValue(), scope); @@ -674,11 +665,13 @@ public Map>> getDerivatives(List Map> get() { return get(builder.getDynamicScope(), outputPorts.toArray(FmiBuilder.Port[]::new)); } + @SuppressWarnings("unchecked") @Override public Map> get(int... valueReferences) { List accept = Arrays.stream(valueReferences).boxed().collect(Collectors.toList()); @@ -686,6 +679,7 @@ public Map> get(int... valueReferences) { outputPorts.stream().filter(p -> accept.contains(p.getPortReferenceValue().intValue())).toArray(FmiBuilder.Port[]::new)); } + @SuppressWarnings("unchecked") @Override public Map> get(String... names) { List accept = Arrays.asList(names); @@ -720,41 +714,24 @@ public Map> getAndShare(String... names) { return values; } + @SuppressWarnings("unchecked") @Override public VariableFmi2Api getShared(String name) { return this.getPort(name).getSharedAsVariable(); } + @SuppressWarnings("unchecked") @Override public VariableFmi2Api getShared(FmiBuilder.Port port) { return ((PortFmi3Api) port).getSharedAsVariable(); } + @SuppressWarnings("unchecked") @Override public VariableFmi2Api getSingle(FmiBuilder.Port port) { return (VariableFmi2Api) this.get(port).entrySet().iterator().next().getValue(); } - private String createFunctionName(FmiFunctionType fun) { - switch (fun) { - case ENTERINITIALIZATIONMODE: - return "enterInitializationMode"; - case EXITINITIALIZATIONMODE: - return "exitInitializationMode"; - case SETUPEXPERIMENT: - return "setupExperiment"; - case GETREALOUTPUTDERIVATIVES: - return "getRealOutputDerivatives"; - case SETREALINPUTDERIVATIVES: - return "setRealInputDerivatives"; - case TERMINATE: - return "terminate"; - default: - throw new RuntimeException("Attempting to call function that is type dependant without specifying type: " + fun); - } - - } - private String createFunctionName(FmiFunctionType fun, PortFmi3Api p) { return createFunctionName(fun, p.scalarVariable.getVariable().getTypeIdentifier()); } @@ -775,16 +752,18 @@ private String createFunctionName(FmiFunctionType f, Fmi3TypeEnum type) { return functionName; } + @SuppressWarnings("unchecked") @Override public VariableFmi2Api getSingle(String name) { return this.get(name).entrySet().iterator().next().getValue(); } - + @SuppressWarnings("unchecked") public void set(FmiBuilder.Port p, FmiBuilder.ExpressionValue v) { this.set(new PortValueExpresssionMapImpl(Map.of(p, v))); } + @SuppressWarnings("unchecked") public void set(FmiBuilder.Scope scope, FmiBuilder.Port p, FmiBuilder.ExpressionValue v) { this.set(scope, new PortValueMapImpl(Map.of(p, v))); } @@ -861,7 +840,7 @@ public void set(FmiBuilder.Scope scope, List selectedPorts, F selectedPortsAsStrings.removeAll( ports.stream().map(p -> p.getName() + "-" + p.aMablFmi3InstanceAPI.getName() + "-" + p.aMablFmi3InstanceAPI.getOwner().getName()) .collect(toSet())); - if (selectedPortsAsStrings.size() > 0) { + if (!selectedPortsAsStrings.isEmpty()) { throw new RuntimeException("Unable to set port(s) that is not declared in the FMU: " + selectedPortsAsStrings.stream().map(name -> name.split("-")[0]).collect(Collectors.joining(", "))); } @@ -893,10 +872,7 @@ public void set(FmiBuilder.Scope scope, List selectedPorts, F newAUIntLiteralExp((long) value.size()), valBuf.getReferenceExp().clone())); scope.add(stm); - if (builder.getSettings().fmiErrorHandlingEnabled) { - FmiStatusErrorHandlingBuilder.generate(builder, createFunctionName(FmiFunctionType.SET, sortedPorts.get(0)), this, (IMablScope) scope, - MablApiBuilder.Fmi3Status.FMI_ERROR, MablApiBuilder.Fmi3Status.FMI_FATAL); - } + handleError(scope, createFunctionName(FmiFunctionType.SET, sortedPorts.get(0))); // TODO: IntermediateUpdateMode instead of CanInterpolateInputs? // TODO: commented out for no so it compiles @@ -988,21 +964,17 @@ public void set(FmiBuilder.Scope scope, List selectedPorts, F */ public void setDerivatives(ArrayVariableFmi2Api derValInBuf, ArrayVariableFmi2Api derOrderInBuf, ArrayVariableFmi2Api derRefInBuf, FmiBuilder.Scope scope) { + final String method = "setRealInputDerivatives"; int arraySize = derValInBuf.size(); // Create set derivatives statement which calls setRealOutputDerivatives with derRefInBuf, arraySize, derOrderInBuf and // derValInBuf. PStm ifStm = newAAssignmentStm(builder.getGlobalFmiStatus().getDesignator().clone(), - call(this.getReferenceExp().clone(), createFunctionName(FmiFunctionType.SETREALINPUTDERIVATIVES), - derRefInBuf.getReferenceExp().clone(), newAUIntLiteralExp((long) arraySize), derOrderInBuf.getReferenceExp().clone(), - derValInBuf.getReferenceExp().clone())); + call(this.getReferenceExp().clone(), method, derRefInBuf.getReferenceExp().clone(), newAUIntLiteralExp((long) arraySize), + derOrderInBuf.getReferenceExp().clone(), derValInBuf.getReferenceExp().clone())); scope.add(ifStm); - // If enabled handle potential errors from calling setRealInputDerivatives - if (builder.getSettings().fmiErrorHandlingEnabled) { - FmiStatusErrorHandlingBuilder.generate(builder, createFunctionName(FmiFunctionType.SETREALINPUTDERIVATIVES), this, (IMablScope) scope, - MablApiBuilder.Fmi3Status.FMI_ERROR, MablApiBuilder.Fmi3Status.FMI_FATAL); - } + handleError(scope, method); } @Override @@ -1010,18 +982,20 @@ public void set(PortValueMap val set(builder.getDynamicScope(), value); } - + @SuppressWarnings("unchecked") @Override public void set(FmiBuilder.Port port, FmiBuilder.Variable value) { this.set(new PortVariableMapImpl(Map.of(port, value))); } + @SuppressWarnings("unchecked") @Override public void set(FmiBuilder.Scope scope, FmiBuilder.Port port, FmiBuilder.Variable value) { this.set(scope, new PortVariableMapImpl(Map.of(port, value))); } + @SuppressWarnings("unchecked") @Override public void set(FmiBuilder.Port port, FmiBuilder.Value value) { PortValueMap map = new PortValueMapImpl(); @@ -1034,6 +1008,7 @@ public void set(PortVariableMap scope, FmiBuilder.Port... filterPorts) { @@ -1050,7 +1025,7 @@ public void setLinked(FmiBuilder.Scope scope, FmiBuilder.Port[]) null); } + @SuppressWarnings("unchecked") @Override public void setLinked(FmiBuilder.Port... filterPorts) { this.setLinked(dynamicScope, filterPorts); } + @SuppressWarnings("unchecked") @Override public void setLinked(String... filterNames) { List accept = Arrays.asList(filterNames); @@ -1092,6 +1069,7 @@ public void setLinked(String... filterNames) { } + @SuppressWarnings("unchecked") @Override public void setLinked(long... filterValueReferences) { List accept = Arrays.stream(filterValueReferences).boxed().collect(Collectors.toList()); @@ -1116,12 +1094,14 @@ public void terminate() { @Override public void terminate(FmiBuilder.Scope scope) { - PStm stm = stateTransitionFunction(FmiFunctionType.TERMINATE); + final String method = "terminate"; + + AAssigmentStm stm = + newAAssignmentStm(((IMablScope) scope).getFmiStatusVariable().getDesignator().clone(), call(this.getReferenceExp().clone(), method)); + scope.add(stm); - if (builder.getSettings().fmiErrorHandlingEnabled) { - FmiStatusErrorHandlingBuilder.generate(builder, "terminate", this, (IMablScope) scope, MablApiBuilder.Fmi3Status.FMI_ERROR, - MablApiBuilder.Fmi3Status.FMI_FATAL); - } + + handleError(scope, method); } // TODO: these are work in progress @@ -1209,6 +1189,7 @@ public void share(Map[originalSize+increaseByCount][maxDerivativeOrder] */ + @SuppressWarnings("unchecked") private ArrayVariableFmi2Api growSharedDerBuf(int increaseByCount) { // Get shared buffer creates the buffer with one element. @@ -1351,13 +1332,7 @@ public String getEnvironmentName() { public enum FmiFunctionType { GET, - SET, - ENTERINITIALIZATIONMODE, - EXITINITIALIZATIONMODE, - SETUPEXPERIMENT, - GETREALOUTPUTDERIVATIVES, - SETREALINPUTDERIVATIVES, - TERMINATE + SET } /** @@ -1371,8 +1346,7 @@ static void generate(MablApiBuilder builder, String method, InstanceVariableFmi3 } Function checkStatusEq = - s -> newEqual(((IMablScope) scope).getFmiStatusVariable().getReferenceExp().clone(), - builder.getFmiStatusConstant(s).getReferenceExp().clone()); + s -> newEqual(scope.getFmiStatusVariable().getReferenceExp().clone(), builder.getFmiStatusConstant(s).getReferenceExp().clone()); PExp exp = checkStatusEq.apply(statusesToFail[0]); diff --git a/frameworks/fmi2api/src/main/java/org/intocps/maestro/framework/fmi2/api/mabl/variables/VarWrap.java b/frameworks/fmi2api/src/main/java/org/intocps/maestro/framework/fmi2/api/mabl/variables/VarWrap.java new file mode 100644 index 00000000..a714dbef --- /dev/null +++ b/frameworks/fmi2api/src/main/java/org/intocps/maestro/framework/fmi2/api/mabl/variables/VarWrap.java @@ -0,0 +1,22 @@ +package org.intocps.maestro.framework.fmi2.api.mabl.variables; + +import static org.intocps.maestro.ast.MableAstFactory.*; + +/** + * Utility class to help wrap literals as variables to better reuse code + *

+ * Note that the only method that is valid to call on these objects is getExp + */ +public class VarWrap { + public static BooleanVariableFmi2Api wrap(boolean bool) { + return new BooleanVariableFmi2Api(null, null, null, null, newABoolLiteralExp(bool)); + } + + public static DoubleVariableFmi2Api wrap(double v) { + return new DoubleVariableFmi2Api(null, null, null, null, newARealLiteralExp(v)); + } + + public static IntVariableFmi2Api wrap(int v) { + return new IntVariableFmi2Api(null, null, null, null, newAIntLiteralExp(v)); + } +} diff --git a/plugins/initializer/src/main/kotlin/Initializer.kt b/plugins/initializer/src/main/kotlin/Initializer.kt index 78c6ae7b..6aceca8e 100644 --- a/plugins/initializer/src/main/kotlin/Initializer.kt +++ b/plugins/initializer/src/main/kotlin/Initializer.kt @@ -427,7 +427,16 @@ class Initializer : BasicMaestroExpansionPlugin { logger.debug("Enter initialization Mode") fmuInstances.values.forEach(Consumer { fmu: ComponentVariableFmi2Api -> fmu.enterInitializationMode() }) //FIXME: missing parameters -// fmu3Instances.values.forEach(Consumer { fmu: InstanceVariableFmi3Api -> fmu.enterInitializationMode() }) + val fmi3ToloranceDefined = dynamicScope.store("absoluteTolerance", this.config!!.absoluteTolerance) + fmu3Instances.values.forEach(Consumer { fmu: InstanceVariableFmi3Api -> + fmu.enterInitializationMode( + VarWrap.wrap(false), + VarWrap.wrap(0.0), + externalStartTime, + externalEndTimeDefined, + externalEndTime + ) + }) val instructions = instantiationOrder.map { i -> createInitInstructions(