make it works!

seisfwi · Dec 28, 2022 · bb5730d · bb5730d
1 parent 04c0115
commit bb5730d
Show file tree

Hide file tree

Showing 54 changed files with 3,328 additions and 1,693 deletions.
diff --git a/bin/fd2dmpi b/bin/fd2dmpi
diff --git a/build/lib/toolbox-dev/solver.py b/build/lib/toolbox-dev/solver.py
@@ -123,7 +123,7 @@ def prepare_configfile(self, simu_type, simu_tag, save_snap):
  else:
  msg = "simu_type must be 'forward', 'adjoint' or 'gradient' \n"
  err = 'Unknown simulation type: {}'.format(simu_type)
- raise ValueError(msg + err)
+ raise ValueError(msg + '\n' + err)
 
  fp.write('COORD_FILE=%s\n' % (self.config.path + 'config/geometry.config'))
  fp.write('SOURCE_FILE=%s\n' % (self.config.path + 'config/wavelet/src'))

diff --git a/build/lib/toolbox-dev/utils.py b/build/lib/toolbox-dev/utils.py
@@ -58,6 +58,6 @@ def source_wavelet(amp0, nt, dt, f0, source_type):
  else:
  msg = 'Support source types: Rikcer, Guassian, Ramp. \n'
  err = 'Unknown source type: {}'.format(source_type)
- raise ValueError(msg + err)
+ raise ValueError(msg + '\n' + err)
 
  return wavelet
diff --git a/solver/.mod/datatype.mod b/solver/.mod/datatype.mod
diff --git a/solver/.mod/fdcore.mod b/solver/.mod/fdcore.mod
diff --git a/solver/.mod/fdsolver.mod b/solver/.mod/fdsolver.mod
diff --git a/solver/.mod/io.mod b/solver/.mod/io.mod
diff --git a/solver/.mod/pml.mod b/solver/.mod/pml.mod
diff --git a/solver/.mod/solver.mod b/solver/.mod/solver.mod
diff --git a/solver/.mod/source.mod b/solver/.mod/source.mod
diff --git a/solver/.obj/datatype.o b/solver/.obj/datatype.o
diff --git a/solver/.obj/fd2dmpi.o b/solver/.obj/fd2dmpi.o
diff --git a/solver/.obj/fdcore.o b/solver/.obj/fdcore.o
diff --git a/solver/.obj/fdsolver.o b/solver/.obj/fdsolver.o
diff --git a/solver/.obj/io.o b/solver/.obj/io.o
diff --git a/solver/.obj/solver.o b/solver/.obj/solver.o
diff --git a/solver/.obj/source.o b/solver/.obj/source.o
diff --git a/solver/Makefile b/solver/Makefile
@@ -27,7 +27,7 @@ OBJS = $(DIR_OBJ)/global.o \
  $(DIR_OBJ)/pml.o \
  $(DIR_OBJ)/source.o \
  $(DIR_OBJ)/fdcore.o \
- $(DIR_OBJ)/solver.o
+ $(DIR_OBJ)/fdsolver.o
 
 all: dir fd2dmpi
 
@@ -39,13 +39,8 @@ fd2dmpi: $(OBJS) $(DIR_OBJ)/fd2dmpi.o
  $(FCC) -o $@ $^ $(LDFLAGS)
  mv $@ ../$(DIR_EXE)
 
-bin2su.x: $(OBJS) $(DIR_OBJ)/bin2su.o
- $(FCC) -o $@ $^ $(LDFLAGS)
- mv $@ ../$(DIR_EXE)
-
 $(DIR_OBJ)/%.o: %.f90
  $(FCC) -o $@ $< $(F90FLAGS)
 
 clean:
- rm -f $(DIR_EXE)/* $(DIR_OBJ)/*.o $(DIR_MOD)/*.mod;
-
+ rm -f $(DIR_EXE)/* $(DIR_OBJ)/*.o $(DIR_MOD)/*.mod;
diff --git a/solver/bin2su.f90 b/solver/bin2su.f90
diff --git a/solver/fd2dmpi.f90 b/solver/fd2dmpi.f90
@@ -15,7 +15,7 @@
 !
 program fd2dmpi
 
-use solver
+use fdsolver
 use parser
 
 implicit none
@@ -47,4 +47,3 @@ program fd2dmpi
  endif
 
 end program fd2dmpi
-
diff --git a/solver/solver.f90 → solver/fdsolver.f90 b/solver/solver.f90 → solver/fdsolver.f90
@@ -11,7 +11,7 @@
 
 
 ! module for 2D applications including forward and adjoint modeling
-module solver
+module fdsolver
 
 use fdcore
 use datatype
@@ -349,7 +349,7 @@ subroutine gradient_computing(parfile)
 
  ! Read adjoint source: ./config/wavelet/src1_adj.bin, src2_adj.bin, ...
  call filename(str, par%sourcefile, is, '_adj.bin')
- call read_binfile(str, s_adj, par%nt, coord%ngmax) 
+ call read_binfile(str, s_adj, par%nt, coord%ng(is)) 
 
  ! Read boundary, p_end, u_end, w_end
  call filename(str, par%data_out, is, '/boundary.bin')
@@ -411,5 +411,4 @@ subroutine gradient_computing(parfile)
 
  end subroutine gradient_computing
 
-end module solver
-
+end module fdsolver
diff --git a/test-dev/.ipynb_checkpoints/01_fwi-checkpoint.ipynb b/test-dev/.ipynb_checkpoints/01_fwi-checkpoint.ipynb
diff --git a/test-dev/.ipynb_checkpoints/iterate_CG-checkpoint.dat b/test-dev/.ipynb_checkpoints/iterate_CG-checkpoint.dat
@@ -0,0 +1,11 @@
+**********************************************************************
+ NONLINEAR CONJUGATE GRADIENT ALGORITHM 
+**********************************************************************
+ Convergence criterion : 1.00e-06
+ Niter_max : 20
+ Initial cost is : 6.12e-09
+ Initial norm_grad is : 5.90e+03
+**********************************************************************
+ Niter fk ||gk|| fk/f0 alpha nls ngrad 
+ 0 6.12e-09 5.90e+03 1.00e+00 1.00e+00 0 0
+ 1 1.80e-09 8.70e+03 2.94e-01 5.00e-01 1 2