Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
GPIAG-Software
IFOS2D
Commits
67ab5dcf
Commit
67ab5dcf
authored
Dec 02, 2015
by
Florian Wittkamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Another merge conflict
parent
d8a1cb97
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
18 deletions
+21
-18
src/read_par_json.c
src/read_par_json.c
+21
-18
No files found.
src/read_par_json.c
View file @
67ab5dcf
...
...
@@ -445,7 +445,7 @@ void read_par_json(FILE *fp, char *fileinp){
if
(
HESSIAN
&&
WAVETYPE
!=
1
)
{
err
(
"No HESSIAN yet for SH"
);
}
}
if
(
WAVETYPE
==
3
)
{
if
(
get_int_from_objectlist
(
"JOINT_INVERSION_PSV_SH_TYPE"
,
number_readobjects
,
&
JOINT_INVERSION_PSV_SH_TYPE
,
varname_list
,
value_list
)){
JOINT_INVERSION_PSV_SH_TYPE
=
1
;
fprintf
(
fp
,
"Variable JOINT_INVERSION_PSV_SH_TYPE is set to default value %d.
\n
"
,
JOINT_INVERSION_PSV_SH_TYPE
);
...
...
@@ -464,6 +464,9 @@ void read_par_json(FILE *fp, char *fileinp){
}
else
{
/* Check herer possible dependencies */
}
}
}
if
(
get_int_from_objectlist
(
"INVMAT1"
,
number_readobjects
,
&
INVMAT1
,
varname_list
,
value_list
))
err
(
"Variable INVMAT1 could not be retrieved from the json input file!"
);
else
...
...
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