From e41f944803d89d117da8218237af1b94ef9a5604 Mon Sep 17 00:00:00 2001 From: Devyesh Tandon Date: Wed, 10 Aug 2016 16:19:51 +0530 Subject: [PATCH] Removed DEBUG mode --- mbdynFMI.cc | 7 ++----- mbdynFMI.o | Bin 360960 -> 360792 bytes 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/mbdynFMI.cc b/mbdynFMI.cc index 5eb352a..cb3a1bb 100644 --- a/mbdynFMI.cc +++ b/mbdynFMI.cc @@ -131,9 +131,6 @@ void fmu2::ImportCreateDLL(int type){ int fmu2::GetNumOfContinousStates(void){ numOfContStates = fmi2_import_get_number_of_continuous_states(fmu); - - -// currStatesDer = new double[numOfContStates]; return numOfContStates; } @@ -393,7 +390,7 @@ void fmu2::InitializeAsSlave(const char* location, double tstart, double tend){ jmstatus = fmi2_import_instantiate(fmu, "Model for CS", fmi2_cosimulation, resourceLocation.str().c_str(), visible); STATUSCHECK(jmstatus); - fmistatus = fmi2_import_setup_experiment(fmu, fmi2_true, relativeTolerance, tstart, fmi2_false, tend); + fmistatus = fmi2_import_setup_experiment(fmu, fmi2_true, relativeTolerance, tstart, fmi2_true, tend); STATUSCHECK(fmistatus); fmistatus = fmi2_import_enter_initialization_mode(fmu); @@ -421,7 +418,7 @@ fmu::~fmu(void){ } fmu1::~fmu1(void){ - silent_cout("This was called"); + fmi_xml_free_context(context); } diff --git a/mbdynFMI.o b/mbdynFMI.o index ad28b315d4d5318c0193bb636c63af2357760d79..76dc84f2a6e0f4f1fa77922747d0709ec136fec8 100644 GIT binary patch delta 13238 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