Skip to content

Commit dacfab9

Browse files
[Janitor mode] Fix tabs
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@16798 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent e2b9d38 commit dacfab9

File tree

31 files changed

+254
-254
lines changed

31 files changed

+254
-254
lines changed

SimulationRuntime/cpp/Core/DataExchange/SimData.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55

66
/*Vxworks
7-
* extern "C" ISimData* createSimData()
7+
* extern "C" ISimData* createSimData()
88
{
99
return new SimData();
1010
}

SimulationRuntime/cpp/Core/DataExchange/stdafx.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
#define BOOST_ALL_DYN_LINK
1212
#endif
1313

14-
#define WIN32_LEAN_AND_MEAN
14+
#define WIN32_LEAN_AND_MEAN
1515

1616

1717
#include <vector>
1818
#include <map>
1919
#include <string>
20-
#include <ostream> // Use stream for output
20+
#include <ostream> // Use stream for output
2121

2222
#include <boost/ref.hpp>
2323
#include <boost/bind.hpp>

SimulationRuntime/cpp/Core/SimController/SimManager.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ SimManager::SimManager(boost::shared_ptr<IMixedSystem> system,Configuration* con
88
,_timeeventcounter(NULL)
99
, _events(NULL)
1010
{
11-
11+
1212
_solver = _config->createSelectedSolver(system.get());
13-
13+
1414
_initialization = new Initialization(boost::dynamic_pointer_cast<ISystemInitialization>(_mixed_system));
15-
15+
1616
}
1717
SimManager::~SimManager()
1818
{
@@ -375,14 +375,14 @@ void SimManager::runSingleProcess()
375375
_solver->setStartTime(_tStart);
376376
_solver->setEndTime(_tEnd);
377377

378-
_solver->solve(_solverTask);
378+
_solver->solve(_solverTask);
379379
_solverTask = ISolver::SOLVERCALL(_solverTask ^ ISolver::RECORDCALL);
380380
/* Logs temporarily disabled
381381
BOOST_LOG_SEV(simmgr_lg::get(), simmgr_normal) <<"Run single process." ; */
382382
// Zeitinvervall speichern
383383
//_H =_tEnd - _tStart;
384384

385-
385+
386386

387387
if (_dimtimeevent)
388388
{
@@ -410,7 +410,7 @@ void SimManager::runSingleProcess()
410410
startTime = _tStart;
411411
bool user_stop = false;
412412

413-
while(_continueSimulation)
413+
while(_continueSimulation)
414414
{
415415
for(; iter != _tStops[0].end(); ++iter)
416416
{

SimulationRuntime/cpp/Core/Solver/FactoryExport.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ BOOST_EXTENSION_TYPE_MAP_FUNCTION {
3131
extern "C" void BOOST_EXTENSION_EXPORT_DECL extension_export_solver(boost::extensions::factory_map & fm)
3232
{
3333
fm.get<SolverDefaultImplementation,int,IMixedSystem*, ISolverSettings*>()[1].set<SolverDefaultImplementation>();
34-
fm.get<ISolverSettings,int, IGlobalSettings* >()[1].set<SolverSettings>();
34+
fm.get<ISolverSettings,int, IGlobalSettings* >()[1].set<SolverSettings>();
3535
}
3636

3737
#else

SimulationRuntime/cpp/Include/Core/DataExchange/IHistory.h

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -17,48 +17,48 @@ Copyright (c) 2008, OSMC
1717
class IHistory
1818
{
1919
public:
20-
/**
21-
Returns simvalues for a time entry
22-
*/
23-
virtual void getSimResults(const double time,ublas::vector<double>& v,ublas::vector<double>& dv) =0;
24-
/**
25-
Returns all simulation results for all Variables (R matrix) and rhs(dR)
26-
*/
27-
virtual void getSimResults(ublas::matrix<double>& R,ublas::matrix<double>& dR) =0;
28-
/**
29-
Returns all simulation results for all Variables (R matrix), rhs(dR) and residues (Re)
30-
*/
31-
virtual void getSimResults(ublas::matrix<double>& R,ublas::matrix<double>& dR,ublas::matrix<double>& Re) =0;
32-
33-
virtual void getOutputNames(vector<string >& output_names) = 0;
34-
35-
/**
36-
Returns all output variables results
37-
*/
38-
virtual void getOutputResults(ublas::matrix<double>& OR)=0;
39-
/**
40-
Retunrs all time entries
41-
*/
42-
virtual vector<double> getTimeEntries() =0;
43-
/**
44-
Returns numer of all time entries
45-
*/
46-
virtual unsigned long getSize()=0;
47-
/**
48-
Returns number of variabels (state-,algebraic variables)
49-
*/
50-
virtual unsigned long getDimR()=0;
51-
/**
52-
Retunrs number of state variables
53-
*/
54-
virtual unsigned long getDimdR()=0;
55-
/**
56-
Returns number of residues
57-
*/
58-
virtual unsigned long getDimRe()=0;
59-
/**
60-
Clears simulation buffer
61-
*/
62-
virtual void clear()=0;
63-
virtual ~IHistory() {};
20+
/**
21+
Returns simvalues for a time entry
22+
*/
23+
virtual void getSimResults(const double time,ublas::vector<double>& v,ublas::vector<double>& dv) =0;
24+
/**
25+
Returns all simulation results for all Variables (R matrix) and rhs(dR)
26+
*/
27+
virtual void getSimResults(ublas::matrix<double>& R,ublas::matrix<double>& dR) =0;
28+
/**
29+
Returns all simulation results for all Variables (R matrix), rhs(dR) and residues (Re)
30+
*/
31+
virtual void getSimResults(ublas::matrix<double>& R,ublas::matrix<double>& dR,ublas::matrix<double>& Re) =0;
32+
33+
virtual void getOutputNames(vector<string >& output_names) = 0;
34+
35+
/**
36+
Returns all output variables results
37+
*/
38+
virtual void getOutputResults(ublas::matrix<double>& OR)=0;
39+
/**
40+
Retunrs all time entries
41+
*/
42+
virtual vector<double> getTimeEntries() =0;
43+
/**
44+
Returns numer of all time entries
45+
*/
46+
virtual unsigned long getSize()=0;
47+
/**
48+
Returns number of variabels (state-,algebraic variables)
49+
*/
50+
virtual unsigned long getDimR()=0;
51+
/**
52+
Retunrs number of state variables
53+
*/
54+
virtual unsigned long getDimdR()=0;
55+
/**
56+
Returns number of residues
57+
*/
58+
virtual unsigned long getDimRe()=0;
59+
/**
60+
Clears simulation buffer
61+
*/
62+
virtual void clear()=0;
63+
virtual ~IHistory() {};
6464
};

SimulationRuntime/cpp/Include/Core/DataExchange/ISimVar.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ class ISimVar
77
{
88

99
public:
10-
virtual ~ISimVar() {};
11-
virtual void setName(string name) =0;
12-
virtual string getName() = 0;
10+
virtual ~ISimVar() {};
11+
virtual void setName(string name) =0;
12+
virtual string getName() = 0;
1313

1414
};

SimulationRuntime/cpp/Include/Core/DataExchange/Policies/TextfileWriter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ typedef ublas::vector<double, ublas::bounded_array<double,dim_2> > value_type_dv
3838
stringstream res_output_path;
3939
res_output_path << output_path <<file_name;
4040
_output_stream.open(res_output_path.str().c_str(), ios::out);
41-
41+
4242
}
4343
void read(ublas::matrix<double>& R,ublas::matrix<double>& dR)
4444
{

SimulationRuntime/cpp/Include/Core/DataExchange/SimData.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ class SimData :
2424

2525
};
2626
// Factory-Funktion
27-
//vxworks extern "C" EXPORT ISimData* createSimData();
27+
//vxworks extern "C" EXPORT ISimData* createSimData();
2828

2929

SimulationRuntime/cpp/Include/Core/Extensions/API.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
#endif
77

88
#if defined( _WIN32 ) && defined( _MSC_VER )
9-
# if defined DCS_EXPORTS
10-
# define EXPORT __declspec( dllexport )
11-
# else
12-
# define EXPORT __declspec( dllimport )
13-
# pragma warning( disable : 4251 ) // 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2'
14-
# endif
9+
# if defined DCS_EXPORTS
10+
# define EXPORT __declspec( dllexport )
11+
# else
12+
# define EXPORT __declspec( dllimport )
13+
# pragma warning( disable : 4251 ) // 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2'
14+
# endif
1515
#endif
1616

1717
#if !defined(EXPORT)

SimulationRuntime/cpp/Include/Core/Extensions/IModelicaCompiler.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
class IModelicaCompiler
77
{
88
public:
9-
virtual void StartModelicaCompiler() = 0;
10-
virtual void StopModelicaCompiler() = 0;
11-
virtual void RestStartModelicaCompiler() = 0;
12-
virtual bool SendCommand(string command,string& results) = 0;
13-
virtual void LoadModel(string model_path,bool loadMSL) = 0;
14-
virtual void CreateModelicaSystem(string model_name) = 0;
15-
virtual void destroy()=0;
9+
virtual void StartModelicaCompiler() = 0;
10+
virtual void StopModelicaCompiler() = 0;
11+
virtual void RestStartModelicaCompiler() = 0;
12+
virtual bool SendCommand(string command,string& results) = 0;
13+
virtual void LoadModel(string model_path,bool loadMSL) = 0;
14+
virtual void CreateModelicaSystem(string model_name) = 0;
15+
virtual void destroy()=0;
1616
};
17-
//extern "C" EXPORT IModelicaCompiler* createModelicaCompiler();
17+
//extern "C" EXPORT IModelicaCompiler* createModelicaCompiler();

0 commit comments

Comments
 (0)