Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
H
haem
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Code Review
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Purves, Murray
haem
Commits
366230e0
Commit
366230e0
authored
Jun 21, 2019
by
Lefebvre, Jordan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'virtual-run' into 'master'
Virtual run See merge request nsm/haem!3
parents
55fa2d1c
ebdcd42c
Pipeline
#74081
failed with stages
in 0 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
19 deletions
+10
-19
haemmodel/trajplotworkflow.cc
haemmodel/trajplotworkflow.cc
+8
-18
haemmodel/trajplotworkflow.hh
haemmodel/trajplotworkflow.hh
+2
-1
No files found.
haemmodel/trajplotworkflow.cc
View file @
366230e0
...
...
@@ -87,17 +87,8 @@ void TrajPlotWorkflow::setOriginSymbol(bool origin_symbol)
TrajPlotWorkflow
::
TrajPlotWorkflow
()
{}
void
TrajPlotWorkflow
::
run
()
const
std
::
string
TrajPlotWorkflow
::
buildCommand
()
const
{
// check if this is a file listing separated by '+'
if
(
m_input_path
.
find
(
"+"
)
==
std
::
string
::
npos
)
{
if
(
radix
::
file_exists
(
m_input_path
)
==
false
)
{
throw
std
::
logic_error
(
"***Error: Required input file file does not exist."
);
}
}
//
// Find the trajplot executable
std
::
string
executable
=
...
...
@@ -128,11 +119,6 @@ void TrajPlotWorkflow::run() const
// all Postscript file plotting options
if
(
!
m_map_background
.
empty
())
{
if
(
radix
::
file_exists
(
m_map_background
)
==
false
)
{
throw
std
::
logic_error
(
"***Error: Provided map background does not exist."
);
}
command
<<
" -j"
<<
m_map_background
;
}
if
(
m_projection
!=
TrajPlotMapProjection
::
Auto
)
...
...
@@ -155,9 +141,13 @@ void TrajPlotWorkflow::run() const
{
command
<<
" -s0"
;
}
std
::
cout
<<
command
.
str
()
<<
std
::
endl
;
int
return_code
=
system
(
command
.
str
().
c_str
());
return
command
.
str
();
}
void
TrajPlotWorkflow
::
run
()
const
{
std
::
string
command
=
buildCommand
();
std
::
cout
<<
command
<<
std
::
endl
;
int
return_code
=
system
(
command
.
c_str
());
int
exit_code
=
return_code
;
#ifndef _WIN32
exit_code
=
exit_code
>>
8
;
...
...
haemmodel/trajplotworkflow.hh
View file @
366230e0
...
...
@@ -62,10 +62,11 @@ class RADIX_PUBLIC TrajPlotWorkflow
public:
TrajPlotWorkflow
();
std
::
string
buildCommand
()
const
;
/**
* @brief run Executes the HYSPLIT trajectory plot capability
*/
void
run
()
const
;
v
irtual
v
oid
run
()
const
;
std
::
string
hysplitDirectory
()
const
;
void
setHysplitDirectory
(
const
std
::
string
&
hysplit_directory
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment