Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
IFOS2D
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Environments
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
GPIAG-Software
IFOS2D
Commits
3ead0e78
Commit
3ead0e78
authored
Mar 09, 2016
by
Florian Wittkamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bugfix: TRKILL File & Offset based TRKILL
parent
11b1a422
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
10 deletions
+22
-10
src/read_par_json.c
src/read_par_json.c
+22
-10
No files found.
src/read_par_json.c
View file @
3ead0e78
...
...
@@ -764,13 +764,19 @@ void read_par_json(FILE *fp, char *fileinp){
if
(
get_string_from_objectlist
(
"TRKILL_FILE_STF"
,
number_readobjects
,
TRKILL_FILE_STF
,
varname_list
,
value_list
))
declare_error
(
"Variable TRKILL_FILE_STF could not be retrieved from the json input file!"
);
}
else
{
if
(
get_float_from_objectlist
(
"TRKILL_STF_OFFSET_LOWER"
,
number_readobjects
,
&
TRKILL_STF_OFFSET_LOWER
,
varname_list
,
value_list
)){
TRKILL_STF_OFFSET_LOWER
=
0
.
0
;
if
(
TRKILL_STF_OFFSET
==
0
)
{
/* Only TRKILL File */
if
(
get_string_from_objectlist
(
"TRKILL_FILE_STF"
,
number_readobjects
,
TRKILL_FILE_STF
,
varname_list
,
value_list
))
declare_error
(
"Variable TRKILL_FILE_STF could not be retrieved from the json input file!"
);
}
if
(
get_float_from_objectlist
(
"TRKILL_STF_OFFSET_UPPER"
,
number_readobjects
,
&
TRKILL_STF_OFFSET_UPPER
,
varname_list
,
value_list
)){
declare_error
(
"Variable TRKILL_STF_OFFSET_UPPER could not be retrieved from the json input file!"
);
if
(
TRKILL_STF_OFFSET
==
1
)
{
/* Only Offset based TRKill */
if
(
get_float_from_objectlist
(
"TRKILL_STF_OFFSET_LOWER"
,
number_readobjects
,
&
TRKILL_STF_OFFSET_LOWER
,
varname_list
,
value_list
)){
TRKILL_STF_OFFSET_LOWER
=
0
.
0
;
}
if
(
get_float_from_objectlist
(
"TRKILL_STF_OFFSET_UPPER"
,
number_readobjects
,
&
TRKILL_STF_OFFSET_UPPER
,
varname_list
,
value_list
)){
declare_error
(
"Variable TRKILL_STF_OFFSET_UPPER could not be retrieved from the json input file!"
);
}
}
if
(
TRKILL_STF_OFFSET
==
2
){
if
(
TRKILL_STF_OFFSET
==
2
){
/* Both Offset based TRKill & File */
if
(
get_string_from_objectlist
(
"TRKILL_FILE_STF"
,
number_readobjects
,
TRKILL_FILE_STF
,
varname_list
,
value_list
))
declare_error
(
"Variable TRKILL_FILE_STF could not be retrieved from the json input file!"
);
}
...
...
@@ -862,13 +868,19 @@ void read_par_json(FILE *fp, char *fileinp){
if
(
get_string_from_objectlist
(
"TRKILL_FILE"
,
number_readobjects
,
TRKILL_FILE
,
varname_list
,
value_list
))
declare_error
(
"Variable TRKILL_FILE could not be retrieved from the json input file!"
);
}
else
{
if
(
get_float_from_objectlist
(
"TRKILL_OFFSET_LOWER"
,
number_readobjects
,
&
TRKILL_OFFSET_LOWER
,
varname_list
,
value_list
)){
TRKILL_OFFSET_LOWER
=
0
.
0
;
if
(
TRKILL_OFFSET
==
0
)
{
/* Only TRKILL File */
if
(
get_string_from_objectlist
(
"TRKILL_FILE"
,
number_readobjects
,
TRKILL_FILE
,
varname_list
,
value_list
))
declare_error
(
"Variable TRKILL_FILE could not be retrieved from the json input file!"
);
}
if
(
get_float_from_objectlist
(
"TRKILL_OFFSET_UPPER"
,
number_readobjects
,
&
TRKILL_OFFSET_UPPER
,
varname_list
,
value_list
)){
declare_error
(
"Variable TRKILL_OFFSET_UPPER could not be retrieved from the json input file!"
);
if
(
TRKILL_OFFSET
==
1
)
{
/* Only Offset based TRKill */
if
(
get_float_from_objectlist
(
"TRKILL_OFFSET_LOWER"
,
number_readobjects
,
&
TRKILL_OFFSET_LOWER
,
varname_list
,
value_list
)){
TRKILL_OFFSET_LOWER
=
0
.
0
;
}
if
(
get_float_from_objectlist
(
"TRKILL_OFFSET_UPPER"
,
number_readobjects
,
&
TRKILL_OFFSET_UPPER
,
varname_list
,
value_list
)){
declare_error
(
"Variable TRKILL_OFFSET_UPPER could not be retrieved from the json input file!"
);
}
}
if
(
TRKILL_
OFFSET
==
2
){
if
(
TRKILL_
STF_OFFSET
==
2
){
/* Both Offset based TRKill & File */
if
(
get_string_from_objectlist
(
"TRKILL_FILE"
,
number_readobjects
,
TRKILL_FILE
,
varname_list
,
value_list
))
declare_error
(
"Variable TRKILL_FILE could not be retrieved from the json input file!"
);
}
...
...
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