Remove Mat file logging

add STEP_SIZE and DISCRETE definitions and remove rtmGetStepSize()

Author: t-sommer

grtfmi/CMakeLists.txt

@@ -67,9 +67,6 @@ set(SOURCES
   ${REFMODEL_SOURCES}
   ${RTW_DIR}/fmiwrapper.inc
   ${CMAKE_SOURCE_DIR}/fmi2Functions.c
-  ${MATLAB_ROOT}/rtw/c/src/rt_logging.c
-  ${MATLAB_ROOT}/rtw/c/src/rt_logging_mmi.c
-  ${MATLAB_ROOT}/rtw/c/src/rtw_modelmap_utils.c
   ${CUSTOM_SOURCE}
 )
 

grtfmi/fmi2Functions.c

@@ -1,3 +1,4 @@
+#include <float.h>  /* for DBL_EPSILON */
 #include "fmi2Functions.h"
 
 #include "fmiwrapper.inc"
@@ -58,12 +59,6 @@ fmi2Component fmi2Instantiate(fmi2String instanceName,
 
 #ifdef REUSABLE_FUNCTION
 	instance->S = MODEL();
-
-	const char_T *errmsg = rt_StartDataLogging(rtmGetRTWLogInfo(instance->S),
-		rtmGetTFinal(instance->S),
-		rtmGetStepSize(instance->S),
-		&rtmGetErrorStatus(instance->S));
-
 	MODEL_INITIALIZE(instance->S);
 #else
 	MODEL_INITIALIZE();
@@ -121,12 +116,6 @@ fmi2Status fmi2Reset(fmi2Component c) {
 	MODEL_TERMINATE(instance->S);
 
 	instance->S = MODEL();
-
-	const char_T *errmsg = rt_StartDataLogging(rtmGetRTWLogInfo(instance->S),
-		rtmGetTFinal(instance->S),
-		rtmGetStepSize(instance->S),
-		&rtmGetErrorStatus(instance->S));
-
 	MODEL_INITIALIZE(instance->S);
 #else
 	MODEL_TERMINATE();
@@ -365,17 +354,21 @@ fmi2Status fmi2DoStep(fmi2Component c,
 
 	ModelInstance *instance = (ModelInstance *)c;
 
+#ifndef DISCRETE
 	time_T tNext = currentCommunicationPoint + communicationStepSize;
 
-	while (rtmGetT(instance->S) + rtmGetStepSize(instance->S) < tNext + DBL_EPSILON) {
+	while (rtmGetT(instance->S) + STEP_SIZE < tNext + DBL_EPSILON) {
+#endif
 		MODEL_STEP(instance->S);
 		const char *errorStatus = rtmGetErrorStatus(instance->S);
 		if (errorStatus) {
 			instance->logger(instance->componentEnvironment, instance->instanceName, fmi2Error, "error", errorStatus);
 			return fmi2Error;
 		}
+#ifndef DISCRETE
 	}
-	
+#endif
+
 	return fmi2OK;
 }
 

grtfmi/grtfmi_make_rtw_hook.m

@@ -1,16 +1,6 @@
 function grtfmi_make_rtw_hook(hookMethod, modelName, rtwRoot, templateMakefile, buildOpts, buildArgs, buildInfo)
 
 switch hookMethod
-    
-    case 'entry'
-        
-        stop_time = get_param(modelName, 'StopTime');
-        stop_time = str2double(stop_time);
-        
-        if isfinite(stop_time)
-            warning(['The model has a finite stop time and cannot be simulated beyond that time. ' ...
-                'Set inf as stop time for arbitrary simulation times.']);
-        end
 
     case 'after_make'
 

grtfmi/grtfmi_selectcallback.m

@@ -9,6 +9,10 @@ function grtfmi_selectcallback(hDlg, hSrc)
     slConfigUISetVal(hDlg, hSrc, 'CodeInterfacePackaging', 'Reusable function');
 end
 
+% disable Mat file logging
+slConfigUISetVal(hDlg, hSrc, 'MatFileLogging', 'off');
+slConfigUISetEnabled(hDlg, hSrc, 'MatFileLogging', false);
+
 % declare model reference compliance
 slConfigUISetVal(hDlg, hSrc, 'ModelReferenceCompliant', 'on');
 slConfigUISetEnabled(hDlg, hSrc, 'ModelReferenceCompliant', false);

grtfmi/grtfmixml.tlc

@@ -67,6 +67,10 @@
 #define MODEL_STEP       %<OrigName>_step
 #define MODEL_TERMINATE  %<OrigName>_terminate
 #define RT_MDL_TYPE      %<tSimStructType>
+#define STEP_SIZE        %<FixedStepOpts.FixedStep>
+  %if Solver == "FixedStepDiscrete"
+#define DISCRETE
+  %endif
 
 /* R2019a defines the block parameters as extern */
 #ifndef rtmGetDefaultParam
@@ -80,7 +84,6 @@
 #define RT_MDL_INSTANCE     %<tSimStruct>
 #define rtmGetU(S)          (&%<tInput>)
 #define rtmGetY(S)          (&%<tOutput>)
-#define rtmGetStepSize(rtm) (rtm->Timing.stepSize0)
 %endif
 
 void *getScalarVariable(RT_MDL_TYPE *S, int vr, BuiltInDTypeId *dtypeID) {