Skip to content

Commit

Permalink
[Janitor mode] Fix whitespace
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@21584 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed Jul 21, 2014
1 parent 5e0df25 commit ceee2fe
Show file tree
Hide file tree
Showing 16 changed files with 34 additions and 35 deletions.
10 changes: 5 additions & 5 deletions Compiler/Template/CodegenCpp.tpl
Expand Up @@ -402,7 +402,7 @@ case SIMCODE(modelInfo = MODELINFO(__)) then

<%lastIdentOfPath(modelInfo.name)%>Initialize::~<%lastIdentOfPath(modelInfo.name)%>Initialize()
{
}


Expand All @@ -429,7 +429,7 @@ case SIMCODE(modelInfo = MODELINFO(__)) then

<%lastIdentOfPath(modelInfo.name)%>Jacobian::~<%lastIdentOfPath(modelInfo.name)%>Jacobian()
{
}
<%functionAnalyticJacobians(jacobianMatrixes,simCode)%>
>>
Expand All @@ -455,7 +455,7 @@ case SIMCODE(modelInfo = MODELINFO(__)) then

<%lastIdentOfPath(modelInfo.name)%>StateSelection::~<%lastIdentOfPath(modelInfo.name)%>StateSelection()
{
}
<%functionDimStateSets(stateSets, simCode)%>
<%functionStateSets(stateSets, simCode)%>
Expand Down Expand Up @@ -486,7 +486,7 @@ case SIMCODE(modelInfo = MODELINFO(__)) then

<%lastIdentOfPath(modelInfo.name)%>WriteOutput::~<%lastIdentOfPath(modelInfo.name)%>WriteOutput()
{
delete _historyImpl;
}
IHistory* <%lastIdentOfPath(modelInfo.name)%>WriteOutput::getHistory()
Expand Down Expand Up @@ -534,7 +534,7 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
}
<%lastIdentOfPath(modelInfo.name)%>Extension::~<%lastIdentOfPath(modelInfo.name)%>Extension()
{
}


Expand Down
4 changes: 2 additions & 2 deletions SimulationRuntime/cpp/Core/SimController/SimController.cpp
Expand Up @@ -15,7 +15,7 @@ SimController::SimController(PATH library_path,PATH modelicasystem_path) : SimCo
SimController::~SimController()
{

_systems.clear();
_systems.clear();
}

std::pair<boost::shared_ptr<IMixedSystem>,boost::shared_ptr<ISimData> > SimController::LoadSystem(boost::shared_ptr<ISimData> (*createSimDataCallback)(), boost::shared_ptr<IMixedSystem> (*createSystemCallback)(IGlobalSettings*, boost::shared_ptr<IAlgLoopSolverFactory>, boost::shared_ptr<ISimData>), string modelKey)
Expand Down Expand Up @@ -88,7 +88,7 @@ void SimController::Start(boost::shared_ptr<IMixedSystem> mixedsystem,SimSetting
global_settings->setOutputFormat(simsettings.outputFormat);

global_settings->setAlarmTime(simsettings.timeOut);

global_settings->setOutputPointType(simsettings.outputPointType);
simMgr = boost::shared_ptr<SimManager>(new SimManager(mixedsystem,_config.get()));

Expand Down
2 changes: 1 addition & 1 deletion SimulationRuntime/cpp/Core/SimController/SimManager.cpp
Expand Up @@ -41,7 +41,7 @@ SimManager::~SimManager()
delete _timeeventcounter;
if(_events)
delete [] _events;

}

void SimManager::initialize()
Expand Down
3 changes: 1 addition & 2 deletions SimulationRuntime/cpp/Core/Solver/SimulationMonitor.cpp
Expand Up @@ -34,5 +34,4 @@ void SimulationMonitor::setTimeOut(unsigned int time_out)
}
*/
}



Expand Up @@ -143,7 +143,7 @@ void SolverDefaultImplementation::initialize()
_rejStps = 0;
_zeroStps = 0;
_zeros = 0;

// Set initial step size
//_h = _settings->_globalSettings->_hOutput;
}
Expand Down
16 changes: 8 additions & 8 deletions SimulationRuntime/cpp/Core/System/AlgLoopSolverFactory.cpp
Expand Up @@ -6,26 +6,26 @@

#ifdef ANALYZATION_MODE
AlgLoopSolverFactory::AlgLoopSolverFactory(IGlobalSettings* global_settings,PATH library_path,PATH modelicasystem_path)
:ObjectFactory<OMCFactory>(library_path,modelicasystem_path,library_path)
,StaticNonLinSolverOMCFactory<OMCFactory>(library_path,modelicasystem_path,library_path),
:ObjectFactory<OMCFactory>(library_path,modelicasystem_path,library_path)
,StaticNonLinSolverOMCFactory<OMCFactory>(library_path,modelicasystem_path,library_path),
,StaticLinSolverOMCFactory<OMCFactory>(library_path,modelicasystem_path,library_path)
,_global_settings(global_settings)
{
}
#else
AlgLoopSolverFactory::AlgLoopSolverFactory(IGlobalSettings* global_settings,PATH library_path,PATH modelicasystem_path)
:ObjectFactory<OMCFactory>(library_path,modelicasystem_path,library_path)
,NonLinSolverPolicy(library_path,modelicasystem_path,library_path)
,LinSolverPolicy(library_path,modelicasystem_path,library_path)
,_global_settings(global_settings)
:ObjectFactory<OMCFactory>(library_path,modelicasystem_path,library_path)
,NonLinSolverPolicy(library_path,modelicasystem_path,library_path)
,LinSolverPolicy(library_path,modelicasystem_path,library_path)
,_global_settings(global_settings)
{

}
#endif

AlgLoopSolverFactory::~AlgLoopSolverFactory()
{

}

/// Creates a solver according to given system of equations of type algebraic loop
Expand Down
4 changes: 2 additions & 2 deletions SimulationRuntime/cpp/Include/Core/Solver/SimulationMonitor.h
Expand Up @@ -10,8 +10,8 @@ class BOOST_EXTENSION_MONITOR_DECL SimulationMonitor
void checkTimeout();
protected:
/*nanosecond_type _time_out;*/

bool _interrupt;
/*cpu_timer _timer;*/

};
Expand Up @@ -59,7 +59,7 @@ class BOOST_EXTENSION_SOLVER_DECL SolverDefaultImplementation : public Simulatio
/// Determines current status of a all zero functions (checks for a change in sign in any of all zero functions)
void setZeroState();


/// Called by solver after every successfull integration step (calls writeOutput)
void writeToFile(const int& stp, const double& t, const double& h);
virtual bool stateSelection();
Expand Down Expand Up @@ -119,7 +119,7 @@ class BOOST_EXTENSION_SOLVER_DECL SolverDefaultImplementation : public Simulatio

IWriteOutput::OUTPUT
_outputCommand; ///< Controls the output

private:
/// Definition of signum function
inline static int sgn (const double &c)
Expand Down
2 changes: 1 addition & 1 deletion SimulationRuntime/cpp/Include/Core/Solver/SolverSettings.h
Expand Up @@ -25,7 +25,7 @@ class BOOST_EXTENSION_SOLVERSETTINGS_DECL SolverSettings : public ISolverSetting
{
public:
SolverSettings( IGlobalSettings* globalSettings);
virtual ~SolverSettings();
virtual ~SolverSettings();
/// Initial step size (default: 1e-2)
virtual double gethInit();
virtual void sethInit(double);
Expand Down
Expand Up @@ -13,12 +13,12 @@ struct LinSolverOMCFactory : virtual public ObjectFactory<CreationPolicy> {
:ObjectFactory<CreationPolicy>(library_path,modelicasystem_path,config_path)
,_last_selected_solver("empty")
{
_linsolver_type_map = new type_map();
_linsolver_type_map = new type_map();
}
virtual ~LinSolverOMCFactory()
{
delete _linsolver_type_map;
// ObjectFactory<CreationPolicy>::_factory->UnloadAllLibs(); todo solver lib wird in linsolver factory entlanden
// ObjectFactory<CreationPolicy>::_factory->UnloadAllLibs(); todo solver lib wird in linsolver factory entlanden
}

virtual boost::shared_ptr<ILinSolverSettings> createLinSolverSettings(string lin_solver)
Expand Down
Expand Up @@ -15,13 +15,13 @@ struct NonLinSolverOMCFactory : virtual public ObjectFactory<CreationPolicy>
,_last_selected_solver("empty")
{

_non_linsolver_type_map= new type_map();
_non_linsolver_type_map= new type_map();
}
virtual ~NonLinSolverOMCFactory()
{
delete _non_linsolver_type_map;
ObjectFactory<CreationPolicy>::_factory->UnloadAllLibs();

delete _non_linsolver_type_map;
ObjectFactory<CreationPolicy>::_factory->UnloadAllLibs();
}

virtual boost::shared_ptr<INonLinSolverSettings> createNonLinSolverSettings(string nonlin_solver)
Expand Down
Expand Up @@ -27,7 +27,7 @@ struct SolverOMCFactory : public ObjectFactory<CreationPolicy>
delete _solver_type_map;
delete _settings_type_map;
ObjectFactory<CreationPolicy>::_factory->UnloadAllLibs();

}

virtual boost::shared_ptr<ISettingsFactory> createSettingsFactory()
Expand Down
Expand Up @@ -27,7 +27,7 @@ struct SolverSettingsOMCFactory : public ObjectFactory<CreationPolicy>
{
delete _solver_type_map;
ObjectFactory<CreationPolicy>::_factory->UnloadAllLibs();

}

virtual boost::shared_ptr<ISolverSettings> createSolverSettings(string solvername,boost::shared_ptr<IGlobalSettings> globalSettings)
Expand Down
Expand Up @@ -22,7 +22,7 @@ struct SystemOMCFactory : public ObjectFactory<CreationPolicy>
{
delete _system_type_map;
ObjectFactory<CreationPolicy>::_factory->UnloadAllLibs();

}

virtual boost::shared_ptr<IAlgLoopSolverFactory> createAlgLoopSolverFactory(IGlobalSettings* globalSettings)
Expand Down
Expand Up @@ -55,7 +55,7 @@ SimSettings OMCFactory::ReadSimulationParameter(int argc, const char* argv[])
("alarm,a", po::value<unsigned int >()->default_value(360), "sets timeout in seconds for simulation")
("output-type,O", po::value< string >()->default_value("all"), "the points in time written to result file: all (output steps + events), step (just output points), none")
;
po::command_line_parser(argc, argv).options(desc).allow_unregistered().run();
po::command_line_parser(argc, argv).options(desc).allow_unregistered().run();
po::variables_map vm;
po::store(po::parse_command_line(argc, argv, desc), vm);
po::notify(vm);
Expand Down
2 changes: 1 addition & 1 deletion SimulationRuntime/cpp/Solver/Euler/EulerSettings.cpp
Expand Up @@ -74,7 +74,7 @@ initializes settings object by an xml file
void EulerSettings::load(std::string xml_file)
{



}

Expand Down

0 comments on commit ceee2fe

Please sign in to comment.