Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dmitri Naumov
ogs
Commits
697a0f81
Commit
697a0f81
authored
8 years ago
by
Karsten Rink
Browse files
Options
Downloads
Patches
Plain Diff
removed trailing whitespaces
parent
d81541de
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Applications/FileIO/SWMM/SWMMInterface.cpp
+3
-4
3 additions, 4 deletions
Applications/FileIO/SWMM/SWMMInterface.cpp
Applications/FileIO/SWMM/SWMMInterface.h
+1
-1
1 addition, 1 deletion
Applications/FileIO/SWMM/SWMMInterface.h
BaseLib/StringTools.h
+1
-1
1 addition, 1 deletion
BaseLib/StringTools.h
with
5 additions
and
6 deletions
Applications/FileIO/SWMM/SWMMInterface.cpp
+
3
−
4
View file @
697a0f81
...
@@ -83,7 +83,7 @@ std::array<std::size_t,4> const n_obj_params = { 8, 6, 5, 15 };
...
@@ -83,7 +83,7 @@ std::array<std::size_t,4> const n_obj_params = { 8, 6, 5, 15 };
SwmmInterface
*
SwmmInterface
::
create
(
std
::
string
const
&
file_name
)
SwmmInterface
*
SwmmInterface
::
create
(
std
::
string
const
&
file_name
)
{
{
if
(
file_name
.
length
()
<
5
)
if
(
file_name
.
length
()
<
5
)
return
nullptr
;
return
nullptr
;
if
(
!
(
SwmmInterface
::
isSwmmInputFile
(
file_name
)
||
SwmmInterface
::
isSwmmOutputFile
(
file_name
)))
if
(
!
(
SwmmInterface
::
isSwmmInputFile
(
file_name
)
||
SwmmInterface
::
isSwmmOutputFile
(
file_name
)))
...
@@ -174,7 +174,6 @@ bool SwmmInterface::isSwmmOutputFile(std::string const& out_file_name)
...
@@ -174,7 +174,6 @@ bool SwmmInterface::isSwmmOutputFile(std::string const& out_file_name)
ERR
(
"SWMMInterface: Could not open input file %s."
,
out_file_name
.
c_str
());
ERR
(
"SWMMInterface: Could not open input file %s."
,
out_file_name
.
c_str
());
return
false
;
return
false
;
}
}
in
.
close
();
in
.
close
();
return
true
;
return
true
;
}
}
...
@@ -876,7 +875,7 @@ std::size_t SwmmInterface::getNTimeSteps() const
...
@@ -876,7 +875,7 @@ std::size_t SwmmInterface::getNTimeSteps() const
return
n_time_steps
;
return
n_time_steps
;
}
}
bool
SwmmInterface
::
addResultsToMesh
(
MeshLib
::
Mesh
&
mesh
,
SwmmObject
const
swmm_type
,
bool
SwmmInterface
::
addResultsToMesh
(
MeshLib
::
Mesh
&
mesh
,
SwmmObject
const
swmm_type
,
std
::
string
const
&
vec_name
,
std
::
vector
<
double
>
const
&
data
)
std
::
string
const
&
vec_name
,
std
::
vector
<
double
>
const
&
data
)
{
{
if
(
!
(
swmm_type
==
SwmmObject
::
NODE
)
||
(
swmm_type
==
SwmmObject
::
LINK
))
if
(
!
(
swmm_type
==
SwmmObject
::
NODE
)
||
(
swmm_type
==
SwmmObject
::
LINK
))
...
@@ -971,7 +970,7 @@ std::vector<double> SwmmInterface::getArrayAtTimeStep(SwmmObject obj_type, std::
...
@@ -971,7 +970,7 @@ std::vector<double> SwmmInterface::getArrayAtTimeStep(SwmmObject obj_type, std::
return
data
;
return
data
;
}
}
INFO
(
"Fetching
\"
%s
\"
-data for time step %d..."
,
INFO
(
"Fetching
\"
%s
\"
-data for time step %d..."
,
getArrayName
(
obj_type
,
var_idx
,
SWMM_Npolluts
).
c_str
(),
time_step
);
getArrayName
(
obj_type
,
var_idx
,
SWMM_Npolluts
).
c_str
(),
time_step
);
for
(
std
::
size_t
i
=
0
;
i
<
n_objects
;
++
i
)
for
(
std
::
size_t
i
=
0
;
i
<
n_objects
;
++
i
)
...
...
This diff is collapsed.
Click to expand it.
Applications/FileIO/SWMM/SWMMInterface.h
+
1
−
1
View file @
697a0f81
...
@@ -54,7 +54,7 @@ enum class SwmmObject
...
@@ -54,7 +54,7 @@ enum class SwmmObject
* number of nodes, links or subcatchments but only ever one system.
* number of nodes, links or subcatchments but only ever one system.
* The interface can convert the SWMM input data into a geometry or a (line-)mesh.
* The interface can convert the SWMM input data into a geometry or a (line-)mesh.
* For meshes, also output data can be added to nodes and elements.
* For meshes, also output data can be added to nodes and elements.
* The interface also provides routines for returning data as vectors as well as convenience
* The interface also provides routines for returning data as vectors as well as convenience
* methods for outputting data into CSV files. CSV files will either contain all parameters for one
* methods for outputting data into CSV files. CSV files will either contain all parameters for one
* object at all time steps or all parameters for all objects of a given type at one timestep.
* object at all time steps or all parameters for all objects of a given type at one timestep.
*/
*/
...
...
This diff is collapsed.
Click to expand it.
BaseLib/StringTools.h
+
1
−
1
View file @
697a0f81
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
namespace
BaseLib
{
namespace
BaseLib
{
/**
/**
* Splits a string into a vector of strings. This method only works for string seperation
* Splits a string into a vector of strings. This method only works for string seperation
* recognised by the std::stringstream iterator such as ' ' or '\t'.
* recognised by the std::stringstream iterator such as ' ' or '\t'.
* \param str String to be splitted
* \param str String to be splitted
* \return Vector of strings
* \return Vector of strings
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment