diff --git a/INSTALL b/INSTALL index 20b9570920b7fcf34697d6099cc305594b97e5dd..05688a102699ebea94d7e59a6fad1037350402c7 100644 --- a/INSTALL +++ b/INSTALL @@ -1,11 +1,11 @@ -INSTALL for IFOS +INSTALL for IFOS2D ================== A detailed installation instruction is provided in the chapter 5 of the documentation (IFOS/doc/manual_IFOS.pdf). If the manual is not compiled, please use the script IFOS/doc/compile_LaTeX_manual.sh -To compile IFOS a MAKEFILE is available in the IFOS/par directory. To +To compile IFOS2D a MAKEFILE is available in the IFOS/par directory. To use the MAKEFILE type make diff --git a/README b/README index a2e4f067294689103961b4f69191d3c23aa3dfb2..4ddcf590917c38cef43a5386fe27512c625a180c 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ -README for IFOS +README for IFOS2D ================= -IFOS (Inversion of Full observed seismograms) +IFOS2D (Inversion of Full observed seismograms) is a 2D elastic full waveform inversion code. The inversion problem is solved by a conjugate gradient method. The gradients are computed in the time domain with the adjoint method. The forward modeling is also done in the time domain diff --git a/README.md b/README.md index dc5b68b74e8f12565f23f7f3e37b6898ae364fee..d203ebb980b42b3ce5a102937931f90bccd927fe 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# What is IFOS? +# What is IFOS2D? -IFOS (Inversion of Full observed seismograms) is a 2D elastic full waveform inversion code. +IFOS2D (Inversion of Full observed seismograms) is a 2D elastic full waveform inversion code. The inversion problem is solved by a conjugate gradient method and the gradients are computed in the time domain with the adjoint method. -The forward modeling is done by a time domain finite difference scheme. The manual is included in the download archive or can be downloaded [here](https://git.scc.kit.edu/GPIAG-Software/IFOS/wikis/home) +The forward modeling is done by a time domain finite difference scheme. The manual is included in the download archive or can be downloaded [here](https://git.scc.kit.edu/GPIAG-Software/IFOS2D/wikis/home) # Download and Newsletter -You can Download the [latest Release](https://git.scc.kit.edu/GPIAG-Software/IFOS/tree/Release) or the current [Beta-Version](https://git.scc.kit.edu/GPIAG-Software/IFOS/tree/master) +You can Download the [latest Release](https://git.scc.kit.edu/GPIAG-Software/IFOS2D/tree/Release) or the current [Beta-Version](https://git.scc.kit.edu/GPIAG-Software/IFOS2D/tree/master) To receive news and updates please [register](http://www.gpi.kit.edu/Software-FWI.php) on the email list IFOS@lists.kit.edu. Please use this list also to ask questions on using the software or to report problems or bugs. \ No newline at end of file diff --git a/doc/latex/0_Title.tex b/doc/latex/0_Title.tex index ee34b87ad3e77a9a60bab230acfc40ab2406f234..03f3d1a8fcc7506db1e808d5a49139505707d43f 100644 --- a/doc/latex/0_Title.tex +++ b/doc/latex/0_Title.tex @@ -98,6 +98,5 @@ % \begin{center} % \includegraphics[width=0.18\textwidth]{CAU_Siegel.png} % \hspace{2cm} -\includegraphics[width=0.25\textwidth]{Kitlogo_en_cmyk.pdf} \end{center} \rmfamily \ No newline at end of file diff --git a/doc/latex/IFOS_title1.png b/doc/latex/IFOS_title1.png index c2bbf9dd6ad8bb6a51085b1cb295e9e2520ef2b3..95972e2e29fc91dea73f12240fb8cbc55521adc4 100644 Binary files a/doc/latex/IFOS_title1.png and b/doc/latex/IFOS_title1.png differ diff --git a/doc/latex/Kitlogo_en_cmyk.pdf b/doc/latex/Kitlogo_en_cmyk.pdf deleted file mode 100644 index a20297b42c27a2c5c9a894fe5a1ca3a926ffd572..0000000000000000000000000000000000000000 Binary files a/doc/latex/Kitlogo_en_cmyk.pdf and /dev/null differ diff --git a/par/Makefile b/par/Makefile index 672d007c2ee243c565ec0d508631d1091419a718..d4e474c2a268756a2ad939dd92c71cc317719809 100644 --- a/par/Makefile +++ b/par/Makefile @@ -1,4 +1,4 @@ -default: ../ IFOS +default: ../ IFOS2D .PHONY: aff aff: @@ -17,18 +17,18 @@ libcseife: $(MAKE) -C ../contrib/libcseife install -.PHONY: IFOS -IFOS: aff fourier stfinv libcseife +.PHONY: IFOS2D +IFOS2D: aff fourier stfinv libcseife ifdef MODEL - $(MAKE) -C ../src/ IFOS MODEL=$(MODEL) + $(MAKE) -C ../src/ IFOS2D MODEL=$(MODEL) else - $(MAKE) -C ../src/ IFOS + $(MAKE) -C ../src/ IFOS2D endif .PHONY: clean clean: - rm -rf ../bin/IFOS + rm -rf ../bin/IFOS2D $(MAKE) -C ../contrib/aff clean $(MAKE) -C ../contrib/fourier clean $(MAKE) -C ../contrib/stfinv clean diff --git a/par/run_toy_example.sh b/par/run_toy_example.sh index 31688b39e39c87d45a4f40cd3386d9dba1d3e123..2a334c5725b3a8d7e35b1a1960e0e99601e0b258 100755 --- a/par/run_toy_example.sh +++ b/par/run_toy_example.sh @@ -6,13 +6,13 @@ # compiling all libraries and IFOS make clean -make IFOS MODEL=../genmod/toy_example_true.c +make IFOS2D MODEL=../genmod/toy_example_true.c # starting IFOS for forward modeling # (depending on the MPI package you maybe have to adjust the following programme call, # e.g. when using openMPI you do not have to use the 'lamboot' command) #lamboot -mpirun -np 4 nice -19 ../bin/IFOS in_and_out/toy_example/toy_example_FW.json | tee in_and_out/toy_example/toy_example_FW.out +mpirun -np 4 nice -19 ../bin/IFOS2D in_and_out/toy_example/toy_example_FW.json | tee in_and_out/toy_example/toy_example_FW.out ############################################################### # running the inversion # @@ -20,8 +20,8 @@ mpirun -np 4 nice -19 ../bin/IFOS in_and_out/toy_example/toy_example_FW.json | t # compiling IFOS make clean -make IFOS MODEL=../genmod/toy_example_start.c +make IFOS2D MODEL=../genmod/toy_example_start.c # starting IFOS #lamboot -mpirun -np 4 nice -19 ../bin/IFOS in_and_out/toy_example/toy_example_INV.json | tee in_and_out/toy_example/toy_example_INV.out +mpirun -np 4 nice -19 ../bin/IFOS2D in_and_out/toy_example/toy_example_INV.json | tee in_and_out/toy_example/toy_example_INV.out diff --git a/par/run_toy_example_SH.sh b/par/run_toy_example_SH.sh index cd4dd0157db48f8dce07cc32ff54b0a97642ba61..aa77aea17d509af38d022e56a1e2d534d9770581 100755 --- a/par/run_toy_example_SH.sh +++ b/par/run_toy_example_SH.sh @@ -6,13 +6,13 @@ # compiling all libraries and IFOS make clean -make IFOS MODEL=../genmod/toy_example_true.c MODEL_EL=../genmod/toy_example_elastic_true.c +make IFOS2D MODEL=../genmod/toy_example_true.c MODEL_EL=../genmod/toy_example_elastic_true.c # starting IFOS for forward modeling # (depending on the MPI package you maybe have to adjust the following programme call, # e.g. when using openMPI you do not have to use the 'lamboot' command) #lamboot -mpirun -np 4 ../bin/IFOS in_and_out/toy_example/toy_example_FW_SH.json | tee in_and_out/toy_example/toy_example_FW_SH.out +mpirun -np 4 ../bin/IFOS2D in_and_out/toy_example/toy_example_FW_SH.json | tee in_and_out/toy_example/toy_example_FW_SH.out ############################################################### @@ -21,8 +21,8 @@ mpirun -np 4 ../bin/IFOS in_and_out/toy_example/toy_example_FW_SH.json | tee in_ # compiling IFOS make clean -make IFOS MODEL=../genmod/toy_example_start.c MODEL_EL=../genmod/toy_example_elastic_start.c +make IFOS2D MODEL=../genmod/toy_example_start.c MODEL_EL=../genmod/toy_example_elastic_start.c # starting IFOS #lamboot -mpirun -np 4 ../bin/IFOS in_and_out/toy_example/toy_example_INV_SH.json | tee in_and_out/toy_example/toy_example_INV_SH.out +mpirun -np 4 ../bin/IFOS2D in_and_out/toy_example/toy_example_INV_SH.json | tee in_and_out/toy_example/toy_example_INV_SH.out diff --git a/par/run_toy_example_ac.sh b/par/run_toy_example_ac.sh index b0aebcf2c80c05d67c744b043aa5d6f2d4c9d882..6b83d081112cf9317d750fc12cf22a9cc4151d1d 100755 --- a/par/run_toy_example_ac.sh +++ b/par/run_toy_example_ac.sh @@ -13,10 +13,10 @@ rm su/measured_data/toy_example* # compiling all libraries and IFOS make clean -make IFOS MODEL_AC=../genmod/toy_example_ac_true.c +make IFOS2D MODEL_AC=../genmod/toy_example_ac_true.c # starting IFOS for forward modeling -mpirun -np 4 nice -19 ../bin/IFOS in_and_out/toy_example/toy_example_ac_FW.json | tee in_and_out/toy_example/toy_example_ac_FW.out +mpirun -np 4 nice -19 ../bin/IFOS2D in_and_out/toy_example/toy_example_ac_FW.json | tee in_and_out/toy_example/toy_example_ac_FW.out ############################################################### # running the inversion # @@ -24,10 +24,10 @@ mpirun -np 4 nice -19 ../bin/IFOS in_and_out/toy_example/toy_example_ac_FW.json # compiling IFOS make clean -make IFOS MODEL_AC=../genmod/toy_example_ac_start.c +make IFOS2D MODEL_AC=../genmod/toy_example_ac_start.c # starting IFOS -mpirun -np 4 nice -19 ../bin/IFOS in_and_out/toy_example/toy_example_ac_INV.json | tee in_and_out/toy_example/toy_example_ac_INV.out +mpirun -np 4 nice -19 ../bin/IFOS2D in_and_out/toy_example/toy_example_ac_INV.json | tee in_and_out/toy_example/toy_example_ac_INV.out make clean diff --git a/par/startIFOS.sh b/par/startIFOS.sh index f12389679f7aeef727b177b54af6b11b617c7944..eca6405cd9e5c622dedf4a852fda24cdc316f84d 100755 --- a/par/startIFOS.sh +++ b/par/startIFOS.sh @@ -1,6 +1,6 @@ #lamboot -v lamhosts lamboot -mpirun -np 8 nice -19 ../bin/IFOS in_and_out/IFOS_INV.json | tee in_and_out/IFOS_INV.out +mpirun -np 8 nice -19 ../bin/IFOS2D in_and_out/IFOS_INV.json | tee in_and_out/IFOS_INV.out #cd su diff --git a/par/start_forward.sh b/par/start_forward.sh index dcb437ab283f68bf80a082dd21212fac025effda..5d4a3613a7a3ce99e57c7ebe63204b4722f65607 100755 --- a/par/start_forward.sh +++ b/par/start_forward.sh @@ -2,7 +2,7 @@ rm -f su/IFOS* su/measured_data/IFOS* lamboot #lamboot -v lamhosts -mpirun -np 8 nice -19 ../bin/IFOS in_and_out/IFOS_FW.json | tee in_and_out/IFOS_FW.out +mpirun -np 8 nice -19 ../bin/IFOS2D in_and_out/IFOS_FW.json | tee in_and_out/IFOS_FW.out cd model cp model_Test_rho_it_0.bin model_Test_vp_it_0.bin model_Test_vs_it_0.bin ../model_true/. cd .. diff --git a/src/ifos.c b/src/IFOS2D.c similarity index 100% rename from src/ifos.c rename to src/IFOS2D.c diff --git a/src/Makefile b/src/Makefile index 9546c50ee0d8de3764f56a4a12896ff3557af190..e7cb45f7b0b2816560bfc10998646625967a2efe 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,4 +1,4 @@ -# Makefile for IFOS +# Makefile for IFOS2D #-------------------------------------------------------- # edit here: @@ -49,8 +49,8 @@ SNAPMERGE_SCR = \ util.c -IFOS= \ - ifos.c \ +IFOS2D= \ + IFOS2D.c \ stf.c \ window_cos.c \ calc_mat_change_test.c \ @@ -166,15 +166,14 @@ IFOS= \ SNAPMERGE_OBJ = $(SNAPMERGE_SCR:%.c=%.o) -IFOS_OBJ = $(IFOS:%.c=%.o) +IFOS_OBJ = $(IFOS2D:%.c=%.o) snapmerge: $(SNAPMERGE_OBJ) $(CC) $(SFLAGS) $(SNAPMERGE_OBJ) -o ../bin/snapmerge $(LFLAGS) -IFOS: $(IFOS_OBJ) +IFOS2D: $(IFOS_OBJ) $(CC) $(SFLAGS) $(IFOS_OBJ) -o $(EXEC)/IFOS $(LFLAGS) - clean: find . -name "*.o" -exec rm {} \; find . -name "*.c%" -exec rm {} \;