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
94401689
Commit
94401689
authored
Dec 10, 2015
by
Florian Wittkamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
L-BFGS: Changed names of output files
parent
96f22a36
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
src/LBFGS.c
src/LBFGS.c
+3
-3
src/calc_mat_change_test.c
src/calc_mat_change_test.c
+9
-9
No files found.
src/LBFGS.c
View file @
94401689
...
...
@@ -99,7 +99,7 @@ void lbfgs(float **grad_vs, float **grad_rho, float **grad_vp,float Vs_avg,float
/* Debugging */
if
(
!
ACOUSTIC
)
{
sprintf
(
jac
,
"%s_y_LBFGS_vs_it%d
_w%d.bin.%i.%i"
,
JACOBIAN
,
iteration
,
w
,
POS
[
1
],
POS
[
2
]);
sprintf
(
jac
,
"%s_y_LBFGS_vs_it%d
.bin.%i.%i"
,
JACOBIAN
,
iteration
,
POS
[
1
],
POS
[
2
]);
FP_JAC
=
fopen
(
jac
,
"wb"
);
}
...
...
@@ -142,10 +142,10 @@ void lbfgs(float **grad_vs, float **grad_rho, float **grad_vp,float Vs_avg,float
if
(
!
ACOUSTIC
)
{
fclose
(
FP_JAC
);
MPI_Barrier
(
MPI_COMM_WORLD
);
sprintf
(
jac
,
"%s_y_LBFGS_vs_it%d
_w%d.bin"
,
JACOBIAN
,
iteration
,
w
);
sprintf
(
jac
,
"%s_y_LBFGS_vs_it%d
.bin"
,
JACOBIAN
,
iteration
);
if
(
MYID
==
0
)
mergemod
(
jac
,
3
);
MPI_Barrier
(
MPI_COMM_WORLD
);
sprintf
(
jac
,
"%s_y_LBFGS_vs_it%d
_w%d.bin.%i.%i"
,
JACOBIAN
,
iteration
,
w
,
POS
[
1
],
POS
[
2
]);
sprintf
(
jac
,
"%s_y_LBFGS_vs_it%d
.bin.%i.%i"
,
JACOBIAN
,
iteration
,
POS
[
1
],
POS
[
2
]);
remove
(
jac
);
}
...
...
src/calc_mat_change_test.c
View file @
94401689
...
...
@@ -62,17 +62,17 @@ void calc_mat_change_test(float ** waveconv, float ** waveconv_rho, float *
if
(
w
==
0
)
w
=
N_LBFGS
;
if
(
!
ACOUSTIC
){
sprintf
(
jac
,
"%s_s_LBFGS_vs_it%d
_w%d.bin.%i.%i"
,
JACOBIAN
,
iter
+
1
,
w
,
POS
[
1
],
POS
[
2
]);
sprintf
(
jac
,
"%s_s_LBFGS_vs_it%d
.bin.%i.%i"
,
JACOBIAN
,
iter
+
1
,
POS
[
1
],
POS
[
2
]);
FP_JAC
=
fopen
(
jac
,
"wb"
);
}
if
(
LBFGS_NPAR
>
1
){
sprintf
(
jac2
,
"%s_s_LBFGS_rho_it%d
_w%d.bin.%i.%i"
,
JACOBIAN
,
iter
+
1
,
w
,
POS
[
1
],
POS
[
2
]);
sprintf
(
jac2
,
"%s_s_LBFGS_rho_it%d
.bin.%i.%i"
,
JACOBIAN
,
iter
+
1
,
POS
[
1
],
POS
[
2
]);
FP_JAC2
=
fopen
(
jac2
,
"wb"
);
}
if
(
LBFGS_NPAR
>
2
){
sprintf
(
jac2
,
"%s_s_LBFGS_vp_it%d
_w%d.bin.%i.%i"
,
JACOBIAN
,
iter
+
1
,
w
,
POS
[
1
],
POS
[
2
]);
sprintf
(
jac2
,
"%s_s_LBFGS_vp_it%d
.bin.%i.%i"
,
JACOBIAN
,
iter
+
1
,
POS
[
1
],
POS
[
2
]);
FP_JAC3
=
fopen
(
jac2
,
"wb"
);
}
...
...
@@ -344,30 +344,30 @@ void calc_mat_change_test(float ** waveconv, float ** waveconv_rho, float *
if
(
!
ACOUSTIC
){
fclose
(
FP_JAC
);
MPI_Barrier
(
MPI_COMM_WORLD
);
sprintf
(
jac
,
"%s_s_LBFGS_vs_it%d
_w%d.bin"
,
JACOBIAN
,
iter
+
1
,
w
);
sprintf
(
jac
,
"%s_s_LBFGS_vs_it%d
.bin"
,
JACOBIAN
,
iter
+
1
);
if
(
MYID
==
0
)
mergemod
(
jac
,
3
);
MPI_Barrier
(
MPI_COMM_WORLD
);
sprintf
(
jac
,
"%s_s_LBFGS_vs_it%d
_w%d.bin.%i.%i"
,
JACOBIAN
,
iter
+
1
,
w
,
POS
[
1
],
POS
[
2
]);
sprintf
(
jac
,
"%s_s_LBFGS_vs_it%d
.bin.%i.%i"
,
JACOBIAN
,
iter
+
1
,
POS
[
1
],
POS
[
2
]);
remove
(
jac
);
}
if
(
LBFGS_NPAR
>
1
){
fclose
(
FP_JAC2
);
MPI_Barrier
(
MPI_COMM_WORLD
);
sprintf
(
jac
,
"%s_s_LBFGS_rho_it%d
_w%d.bin"
,
JACOBIAN
,
iter
+
1
,
w
);
sprintf
(
jac
,
"%s_s_LBFGS_rho_it%d
.bin"
,
JACOBIAN
,
iter
+
1
);
if
(
MYID
==
0
)
mergemod
(
jac
,
3
);
MPI_Barrier
(
MPI_COMM_WORLD
);
sprintf
(
jac
,
"%s_s_LBFGS_rho_it%d
_w%d.bin.%i.%i"
,
JACOBIAN
,
iter
+
1
,
w
,
POS
[
1
],
POS
[
2
]);
sprintf
(
jac
,
"%s_s_LBFGS_rho_it%d
.bin.%i.%i"
,
JACOBIAN
,
iter
+
1
,
POS
[
1
],
POS
[
2
]);
remove
(
jac
);
}
if
(
LBFGS_NPAR
>
2
){
fclose
(
FP_JAC3
);
MPI_Barrier
(
MPI_COMM_WORLD
);
sprintf
(
jac
,
"%s_s_LBFGS_vp_it%d
_w%d.bin"
,
JACOBIAN
,
iter
+
1
,
w
);
sprintf
(
jac
,
"%s_s_LBFGS_vp_it%d
.bin"
,
JACOBIAN
,
iter
+
1
);
if
(
MYID
==
0
)
mergemod
(
jac
,
3
);
MPI_Barrier
(
MPI_COMM_WORLD
);
sprintf
(
jac
,
"%s_s_LBFGS_vp_it%d
_w%d.bin.%i.%i"
,
JACOBIAN
,
iter
+
1
,
w
,
POS
[
1
],
POS
[
2
]);
sprintf
(
jac
,
"%s_s_LBFGS_vp_it%d
.bin.%i.%i"
,
JACOBIAN
,
iter
+
1
,
POS
[
1
],
POS
[
2
]);
remove
(
jac
);
}
}
...
...
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