Commit 67ab5dcf authored by Florian Wittkamp's avatar Florian Wittkamp

Another merge conflict

parent d8a1cb97
...@@ -445,7 +445,7 @@ void read_par_json(FILE *fp, char *fileinp){ ...@@ -445,7 +445,7 @@ void read_par_json(FILE *fp, char *fileinp){
if (HESSIAN && WAVETYPE!=1) { if (HESSIAN && WAVETYPE!=1) {
err("No HESSIAN yet for SH"); 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)){ 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; 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); 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){ ...@@ -464,6 +464,9 @@ void read_par_json(FILE *fp, char *fileinp){
} else { } else {
/* Check herer possible dependencies */ /* Check herer possible dependencies */
} }
}
}
if (get_int_from_objectlist("INVMAT1",number_readobjects,&INVMAT1,varname_list, value_list)) 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!"); err("Variable INVMAT1 could not be retrieved from the json input file!");
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment