Merge branch 'develop' into Seitosh/import

.gitlab-ci.yml

+stages:
+    - build
+
+gcc:
+  stage: build
+  script:
+    - export cc=gcc && ${cc} --version
+    - export OMPI_MPICC=${cc} && mpicc --version
+    - cd par/ && make install
\ No newline at end of file

README.md

 # What is IFOS2D?
 
+
 **IFOS2D** (**I**nversion of **F**ull **O**bserved **S**eismograms) is a 2-D elastic full waveform inversion code.  
 The inversion problem is solved by a conjugate gradient method and the gradients are computed in the time domain by the adjoint state method.  
-The forward modeling is done by a time domain Finite-Difference scheme. 
+The forward modeling is done by a time domain Finite-Difference scheme.
 
 IFOS2D is the reverse (inverse) of our 2-D Finite-Difference forward solver [**SOFI2D**](https://git.scc.kit.edu/GPIAG-Software/SOFI2D).
 
 The [**manual**](https://git.scc.kit.edu/GPIAG-Software/IFOS2D/wikis/home) is included in the download archive or can be downloaded [here](https://git.scc.kit.edu/GPIAG-Software/IFOS2D/wikis/home).
 
 # Download and Newsletter
+Release: [![build status](https://git.scc.kit.edu/GPIAG-Software/IFOS2D/badges/master/build.svg)](https://git.scc.kit.edu/GPIAG-Software/IFOS2D/commits/master)  Beta: [![build status](https://git.scc.kit.edu/GPIAG-Software/IFOS2D/badges/develop/build.svg)](https://git.scc.kit.edu/GPIAG-Software/IFOS2D/commits/develop)
 
 You can download the [**latest Release 2.0.2**](https://git.scc.kit.edu/GPIAG-Software/IFOS2D/tags/Release_2.0.2) or the current [**Beta-Version**](https://git.scc.kit.edu/GPIAG-Software/IFOS2D/tree/develop).
 
 To receive news and updates please [register](http://www.gpi.kit.edu/Software-FWI.php) on the email list [IFOS@lists.kit.edu](http://www.gpi.kit.edu/Software-FWI.php).  
-Please use this list also to ask questions or to report problems or bugs.
\ No newline at end of file
+Please use this list also to ask questions or to report problems or bugs.

doc/latex/6_Parameter_Definition.tex

@@ -322,7 +322,9 @@ The locations of the receivers may either be specified in a separate file REC\_F
 \end{verbatim}}}
 These receiver coordinates in REC\_FILE are shifted by REFREC[1], REFREC[2] into the  x- and y-direction, respectively. This allows for completely moving the receiver spread without modifying REC\_FILE. This may be useful for the simulation of moving profiles in reflection seismics.
 
-If READREC=0 the receiver locations must be specified in the parameter file. In this case, it is assumed that the receivers are located along a straight line. The first receiver position is defined by (XREC1, YREC1), and the last receiver position by (XREC1, YREC1). The spacing between receivers is NGEOPH grid points. 
+If READREC=0 the receiver locations must be specified in the parameter file. In this case, it is assumed that the receivers are located along a straight line. The first receiver position is defined by (XREC1, YREC1), and the last receiver position by (XREC1, YREC1). The spacing between receivers is NGEOPH grid points.
+
+READREC=2 is made for a moving streamer aquisition geometry. The receiver positions for shot 1 must be specified in the parameter file (as described for READREC=0). For all other shots the receiver positions are moved according to the movement of the following source. This implementation allows a memory saving usage of moving geometries. The receivers must be in the same depth and all receivers must be located in the model for all shots.
 
 Receivers are always located on full grid indices, i.e. a receiver that is located between two grid points will be shifted by the FD program to the closest next grid point. It is not yet possible
 to output seismograms for arbitrary receiver locations since this would require a certain wavefield interpolation.

genmod/toy_example_true_trench.c

+/*-----------------------------------------------------------------------------------------
+ * Copyright (C) 2005  <name of author>
+ *
+ * This file is part of DENISE.
+ * 
+ * DENISE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2.0 of the License only.
+ * 
+ * DENISE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with DENISE. See file COPYING and/or <http://www.gnu.org/licenses/gpl-2.0.html>.
+-----------------------------------------------------------------------------------------*/
+
+/* $Id: hh_el.c,v 2.3 2007/08/21 13:16:19 tbohlen Exp $*/
+/*
+ *   Model defined by flnode file. In this version a constant Q-model with Q_p=Q_s is used. It 
+ *   is defined via the relaxation frequencies and the TAU value given in the input file.  
+ */
+
+#include "fd.h"
+
+void model(float  **  rho, float **  pi, float **  u, float **  taus, float **  taup, float *  eta){
+
+	/*--------------------------------------------------------------------------*/
+	/* extern variables */
+
+	extern int NX, NY, NXG, NYG,  POS[3], MYID, L;
+	extern float DH, DT, *FL, TAU;
+	extern char  MFILE[STRING_SIZE];
+	extern char INV_MODELFILE[STRING_SIZE];	
+
+		/* local variables */
+	float muv, piv, vp, vs, rhov, ts, tp, *pts;
+	int i, j, ii, jj, l;
+	char modfile[STRING_SIZE];
+	
+	FILE *flfile;
+	int nodes;
+	char cline[256];
+	
+	float *fldepth, *flrho, *flvp, *flvs;
+	
+	/*---------------------------------------
+	 Trench "Ettlinger Linie" units in m  
+	----------------------------------------*/
+
+	/* trench=1 - elliptic shaped trench , trench=2 - V shaped trench */
+	int trench=2;
+
+	float width=10;
+	float depth=3;	
+	float pos=NXG/2*DH;
+
+	// Parameters of trench "Ettlinger Linie" velocities in km/s and density in kg/m^3
+	float evs=0.0917;
+	float evp=0.2569;
+	float erho=1.5;	
+	
+	/* fopen FL-node file*/
+	flfile=fopen("model_true/flnodes.toy_example","r");
+        if (flfile==NULL) declare_error(" FL-file could not be opened !");
+	/* nodes specified in FL-node File*/
+	nodes=7;
+
+	/*-----------No changes below that line needed ---------------------------*/
+
+	/* 2 linear lines as border for the v-shape */
+	float m1=2*depth/width;
+	float m2=-m1;
+	float c1=depth*(1-(2*pos/width));
+	float c2=depth*(1+(2*pos/width));
+
+	
+
+	
+	fldepth=vector(1,nodes);
+	flrho=vector(1,nodes);
+	flvp=vector(1,nodes);
+	flvs=vector(1,nodes);
+		
+	
+	/* vector for maxwellbodies */
+	pts=vector(1,L);
+	for (l=1;l<=L;l++) {
+		pts[l]=1.0/(2.0*PI*FL[l]);
+		eta[l]=DT/pts[l];
+	}
+	 
+	
+	
+	/*read FL nodes from File*/
+	
+	
+	for (l=1;l<=nodes;l++){
+		fgets(cline,255,flfile);
+		if (cline[0]!='#'){
+			sscanf(cline,"%f%f%f%f",&fldepth[l], &flrho[l], &flvp[l], &flvs[l]);
+		}
+		else l=l-1;
+	
+	}
+	
+	
+	if(MYID==0){
+	printf(" ------------------------------------------------------------------ \n\n");
+	printf(" Information of FL nodes: \n\n");
+	printf(" \t depth \t rho \t vp \t vs \n\n");
+	
+	for (l=1;l<=nodes;l++){
+	printf(" \t %f \t %f \t %f \t %f\n\n",fldepth[l],flrho[l],flvp[l],flvs[l]);
+	}
+	printf(" ------------------------------------------------------------------ \n\n");
+	}
+	/*-----------------------------------------------------------------------*/
+	
+	
+		
+	/*-----------------------------------------------------------------------*/
+
+	/* loop over global grid */
+		for (i=1;i<=NXG;i++){
+			for (l=1;l<nodes;l++){
+				if (fldepth[l]==fldepth[l+1]){
+					if ((i==1) && (MYID==0)){
+					printf("depth: %f m: double node\n",fldepth[l]);}}
+				else{
+					for (j=(int)(fldepth[l]/DH)+1;j<=(int)(fldepth[l+1]/DH);j++){
+			
+						vp=0.0; vs=0.0; rhov=0.0;
+				  
+						vp=(DH*(j-1)-fldepth[l])*(flvp[l+1]-flvp[l])/(fldepth[l+1]-fldepth[l])+flvp[l];
+						vp=vp*1000.0;
+						vs=(DH*(j-1)-fldepth[l])*(flvs[l+1]-flvs[l])/(fldepth[l+1]-fldepth[l])+flvs[l];
+						vs=vs*1000.0;
+						rhov=(DH*(j-1)-fldepth[l])*(flrho[l+1]-flrho[l])/(fldepth[l+1]-fldepth[l])+flrho[l];
+						rhov=rhov*1000.0;
+						
+						
+						muv=vs;
+						piv=vp;
+						ts=TAU;
+						tp=TAU;
+						
+						/* only the PE which belongs to the current global gridpoint 
+				  		is saving model parameters in his local arrays */
+						if ((POS[1]==((i-1)/NX)) && 
+				    		(POS[2]==((j-1)/NY))){
+						ii=i-POS[1]*NX;
+						jj=j-POS[2]*NY;
+
+						u[jj][ii]=muv;
+						rho[jj][ii]=rhov;
+						pi[jj][ii]=piv;
+						taus[jj][ii]=ts;
+						taup[jj][ii]=tp;
+						}
+					}
+				}
+			}
+			
+			for (j=(int)(fldepth[nodes]/DH)+1;j<=NYG;j++){
+			  
+				vp=0.0; vs=0.0; rhov=0.0;
+				vp=flvp[nodes]*1000.0; vs=flvs[nodes]*1000.0; rhov=flrho[nodes]*1000.0;
+				
+				muv=vs;
+				piv=vp;
+				ts=TAU;
+				tp=TAU;
+
+				/* only the PE which belongs to the current global gridpoint 
+				  		is saving model parameters in his local arrays */
+						if ((POS[1]==((i-1)/NX)) && 
+				    		(POS[2]==((j-1)/NY))){
+						ii=i-POS[1]*NX;
+						jj=j-POS[2]*NY;
+
+						u[jj][ii]=muv;
+						rho[jj][ii]=rhov;
+						pi[jj][ii]=piv;
+						taus[jj][ii]=ts;
+						taup[jj][ii]=tp;
+						}
+			}
+			/*Trench Ettlinger Linie*/
+			if (trench==1) {
+			 	for (j=1;j<=(int) depth/DH+1;j++){
+				
+					if ( ( ((pos-i*DH) * (pos-i*DH))/(width/2*width/2) + ((j*DH)*(j*DH))/(depth*depth) ) <=1){
+                                	vp=evp*1000.0; 
+					vs=evs*1000.0; 
+					rhov=erho*1000.0;
+				
+                                	muv=vs;
+                                	piv=vp;
+                                	ts=TAU;
+                                	tp=TAU;
+				
+
+                               	 	/* only the PE which belongs to the current global gridpoint 
+                                                is saving model parameters in his local arrays */
+                                                if ((POS[1]==((i-1)/NX)) &&
+                                                (POS[2]==((j-1)/NY))){
+                                                ii=i-POS[1]*NX;
+                                                jj=j-POS[2]*NY;
+
+                                                u[jj][ii]=muv;
+                                                rho[jj][ii]=rhov;
+                                                pi[jj][ii]=piv;
+                                                taus[jj][ii]=ts;
+                                                taup[jj][ii]=tp;
+                                                }
+                        		}
+				}
+
+			}
+			 /*Trench V-shape Ettlinger Linie*/
+                        if (trench==2) {
+                                for (j=1;j<=(int) depth/DH+1;j++){
+					
+                                        if ( ((i*DH)*m1+c1 >=0) && j*DH <= (i*DH)*m1+c1  && j*DH <= (i*DH)*m2+c2){
+                                        vp=evp*1000.0;
+                                        vs=evs*1000.0;
+                                        rhov=erho*1000.0;
+
+                                        muv=vs;
+                                        piv=vp;
+                                        ts=TAU;
+                                        tp=TAU;
+
+
+                                        /* only the PE which belongs to the current global gridpoint 
+                                                is saving model parameters in his local arrays */
+                                                if ((POS[1]==((i-1)/NX)) &&
+                                                (POS[2]==((j-1)/NY))){
+                                                ii=i-POS[1]*NX;
+                                                jj=j-POS[2]*NY;
+
+                                                u[jj][ii]=muv;
+                                                rho[jj][ii]=rhov;
+                                                pi[jj][ii]=piv;
+                                                taus[jj][ii]=ts;
+                                                taup[jj][ii]=tp;
+                                                }
+                                        }
+                                }
+
+                        }
+
+		}
+		
+		
+        sprintf(modfile,"%s_rho_it0.bin",INV_MODELFILE);
+	writemod(modfile,rho,3);
+	MPI_Barrier(MPI_COMM_WORLD);
+	if (MYID==0) mergemod(modfile,3);
+	MPI_Barrier(MPI_COMM_WORLD); 
+	sprintf(modfile,"%s_rho_it0.bin.%i%i",INV_MODELFILE,POS[1],POS[2]);
+	remove(modfile);
+	
+	sprintf(modfile,"%s_vs_it0.bin",INV_MODELFILE);
+	writemod(modfile,u,3);
+	MPI_Barrier(MPI_COMM_WORLD);
+	if (MYID==0) mergemod(modfile,3);
+	MPI_Barrier(MPI_COMM_WORLD); 
+	sprintf(modfile,"%s_vs_it0.bin.%i%i",INV_MODELFILE,POS[1],POS[2]);
+	remove(modfile);
+	
+	sprintf(modfile,"%s_vp_it0.bin",INV_MODELFILE);
+	writemod(modfile,pi,3);
+	MPI_Barrier(MPI_COMM_WORLD);
+	if (MYID==0) mergemod(modfile,3);
+	MPI_Barrier(MPI_COMM_WORLD); 
+	sprintf(modfile,"%s_vp_it0.bin.%i%i",INV_MODELFILE,POS[1],POS[2]);
+	remove(modfile);
+	
+	sprintf(modfile,"%s_taus_it0.bin",INV_MODELFILE);
+	writemod(modfile,taus,3);
+	MPI_Barrier(MPI_COMM_WORLD);
+	if (MYID==0) mergemod(modfile,3);
+	MPI_Barrier(MPI_COMM_WORLD); 
+	sprintf(modfile,"%s_taus_it0.bin.%i%i",INV_MODELFILE,POS[1],POS[2]);
+	remove(modfile);
+	
+	sprintf(modfile,"%s_taup_it0.bin",INV_MODELFILE);
+	writemod(modfile,taup,3);
+	MPI_Barrier(MPI_COMM_WORLD);
+	if (MYID==0) mergemod(modfile,3);
+	MPI_Barrier(MPI_COMM_WORLD); 
+	sprintf(modfile,"%s_taup_it0.bin.%i%i",INV_MODELFILE,POS[1],POS[2]);
+	remove(modfile);
+	
+	
+	free_vector(fldepth,1,nodes);
+	free_vector(flrho,1,nodes);
+	free_vector(flvp,1,nodes);
+	free_vector(flvs,1,nodes);
+	
+	free_vector(pts,1,L);
+	 
+}
+
+
+

par/run_toy_example.sh

@@ -7,6 +7,14 @@
 # compiling all libraries and  IFOS
 make install MODEL=../genmod/toy_example_true.c
 
+#-------------------------------------------------------------------------------------
+# Insert the trench "Ettlinger Linie" into the toy_example model 
+# in the file ../genmod/toy_example_true_trench.c the size and position can be adjusted
+# Either an elliptic trench or a v-shaped trench can be choosen
+
+#make install MODEL=../genmod/toy_example_true_trench.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)

src/Makefile

@@ -19,7 +19,7 @@ EXEC= ../bin
 
 # LINUX with OpenMPI / IntelMPI and INTEL Compiler
 # Use icc whenever possible, this will be much faster than gcc
-CC=mpiicc
+CC=mpicc
 LFLAGS=-lm -lcseife -lstfinv -laff -lfourierxx -lfftw3 -lstdc++
 CFLAGS=-O3
 SFLAGS=-L./../contrib/libcseife -L./../contrib/bin
@@ -70,6 +70,7 @@ IFOS2D= \
 	IFOS2D.c \
 	stf.c \
 	window_cos.c \
+	alloc_sections.c \
 	calc_mat_change_test.c \
     	calc_res.c \
 	calc_misfit.c \
@@ -205,4 +206,4 @@ clean:
 
 install: clean all
 
--include $(IFOS_OBJ:.o=.d)
\ No newline at end of file
+-include $(IFOS_OBJ:.o=.d)

src/alloc_sections.c

+/*-----------------------------------------------------------------------------------------
+ * Copyright (C) 2016  For the list of authors, see file AUTHORS.
+ *
+ * This file is part of IFOS.
+ *
+ * IFOS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2.0 of the License only.
+ *
+ * IFOS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with IFOS. See file COPYING and/or <http://www.gnu.org/licenses/gpl-2.0.html>.
+ -----------------------------------------------------------------------------------------*/
+
+/*  Computation of local source coordinates
+ *
+ *
+ */
+#include "fd.h"
+ 
+void alloc_sections(int ntr,int ns,float ***sectionvx,float ***sectionvy,float ***sectionvz,float ***sectionp,float ***sectionpnp1,float ***sectionpn,float ***sectioncurl,float ***sectiondiv,
+                    float ***sectionpdata,float ***sectionpdiff,float ***sectionpdiffold,float ***sectionvxdata,float ***sectionvxdiff,float ***sectionvxdiffold,float ***sectionvydata,
+                    float ***sectionvydiff,float ***sectionvydiffold,float ***sectionvzdata,float ***sectionvzdiff,float ***sectionvzdiffold)
+{
+	extern int SEISMO, WAVETYPE;
+	extern FILE *FP;
+	
+	switch (SEISMO){
+            case 1 : /* particle velocities only */
+                switch (WAVETYPE) {
+                    case 1:
+                        *sectionvx=matrix(1,ntr,1,ns);
+                        *sectionvy=matrix(1,ntr,1,ns);
+                        break;
+                    case 2:
+                        *sectionvz=matrix(1,ntr,1,ns);
+                        break;
+                    case 3:
+                        *sectionvx=matrix(1,ntr,1,ns);
+                        *sectionvy=matrix(1,ntr,1,ns);
+                        *sectionvz=matrix(1,ntr,1,ns);
+                        break;
+                }
+                break;
+            case 2 : /* pressure only */
+                *sectionp=matrix(1,ntr,1,ns);
+                *sectionpnp1=matrix(1,ntr,1,ns);
+                *sectionpn=matrix(1,ntr,1,ns);
+                break;
+            case 3 : /* curl and div only */
+                *sectioncurl=matrix(1,ntr,1,ns);
+                *sectiondiv=matrix(1,ntr,1,ns);
+                break;
+            case 4 : /* everything */
+                switch (WAVETYPE) {
+                    case 1:
+                        *sectionvx=matrix(1,ntr,1,ns);
+                        *sectionvy=matrix(1,ntr,1,ns);
+                        break;
+                    case 2:
+                        *sectionvz=matrix(1,ntr,1,ns);
+                        break;
+                    case 3:
+                        *sectionvx=matrix(1,ntr,1,ns);
+                        *sectionvy=matrix(1,ntr,1,ns);
+                        *sectionvz=matrix(1,ntr,1,ns);
+                        break;
+                }
+                *sectioncurl=matrix(1,ntr,1,ns);
+                *sectiondiv=matrix(1,ntr,1,ns);
+                *sectionp=matrix(1,ntr,1,ns);
+                break;
+            case 5 : /* everything except curl and div*/
+                switch (WAVETYPE) {
+                    case 1:
+                        *sectionvx=matrix(1,ntr,1,ns);
+                        *sectionvy=matrix(1,ntr,1,ns);
+                        break;
+                    case 2:
+                        *sectionvz=matrix(1,ntr,1,ns);
+                        break;
+                    case 3:
+                        *sectionvx=matrix(1,ntr,1,ns);
+                        *sectionvy=matrix(1,ntr,1,ns);
+                        *sectionvz=matrix(1,ntr,1,ns);
+                        break;
+                }
+                *sectionp=matrix(1,ntr,1,ns);
+                break;
+        }
+        
+        *sectionpdata=matrix(1,ntr,1,ns);
+    *sectionpdiff=matrix(1,ntr,1,ns);
+    *sectionpdiffold=matrix(1,ntr,1,ns);
+    switch (WAVETYPE) {
+        case 1:
+            *sectionvxdata=matrix(1,ntr,1,ns);
+            *sectionvxdiff=matrix(1,ntr,1,ns);
+            *sectionvxdiffold=matrix(1,ntr,1,ns);
+            *sectionvydata=matrix(1,ntr,1,ns);
+            *sectionvydiff=matrix(1,ntr,1,ns);
+            *sectionvydiffold=matrix(1,ntr,1,ns);
+            break;
+            
+        case 2:
+            *sectionvzdata=matrix(1,ntr,1,ns);
+            *sectionvzdiff=matrix(1,ntr,1,ns);
+            *sectionvzdiffold=matrix(1,ntr,1,ns);
+            break;
+            
+        case 3:
+            *sectionvxdata=matrix(1,ntr,1,ns);
+            *sectionvxdiff=matrix(1,ntr,1,ns);
+            *sectionvxdiffold=matrix(1,ntr,1,ns);
+            *sectionvydata=matrix(1,ntr,1,ns);
+            *sectionvydiff=matrix(1,ntr,1,ns);
+            *sectionvydiffold=matrix(1,ntr,1,ns);
+            *sectionvzdata=matrix(1,ntr,1,ns);
+            *sectionvzdiff=matrix(1,ntr,1,ns);
+            *sectionvzdiffold=matrix(1,ntr,1,ns);
+            break;
+    }
+ }
+ 
+ 
+ 
+ void dealloc_sections(int ntr,int ns,int **recpos_loc,float **sectionvx,float **sectionvy,float **sectionvz,float **sectionp,float **sectionpnp1,float **sectionpn,float **sectioncurl,float **sectiondiv,
+                    float **sectionpdata,float **sectionpdiff,float **sectionpdiffold,float **sectionvxdata,float **sectionvxdiff,float **sectionvxdiffold,float **sectionvydata,
+                    float **sectionvydiff,float **sectionvydiffold,float **sectionvzdata,float **sectionvzdiff,float **sectionvzdiffold)
+{
+	extern int SEISMO, WAVETYPE;
+	extern FILE *FP;
+	
+	free_imatrix(recpos_loc,1,3,1,ntr);
+        switch (SEISMO){
+            case 1 : /* particle velocities only */
+                if (WAVETYPE==1 || WAVETYPE==3) {
+                    free_matrix(sectionvx,1,ntr,1,ns);
+                    free_matrix(sectionvy,1,ntr,1,ns);
+                }
+                if (WAVETYPE==2 || WAVETYPE==3) {
+                    free_matrix(sectionvz,1,ntr,1,ns);
+                }
+                break;
+            case 2 : /* pressure only */
+                if (WAVETYPE==1 || WAVETYPE==3) {
+                    free_matrix(sectionp,1,ntr,1,ns);
+                    free_matrix(sectionpn,1,ntr,1,ns);
+                    free_matrix(sectionpnp1,1,ntr,1,ns);
+                }
+                break;
+            case 3 : /* curl and div only */
+                if (WAVETYPE==1 || WAVETYPE==3) {
+                    free_matrix(sectioncurl,1,ntr,1,ns);
+                    free_matrix(sectiondiv,1,ntr,1,ns);
+                }
+                break;
+            case 4 : /* everything */
+                if (WAVETYPE==1 || WAVETYPE==3) {
+                    free_matrix(sectionvx,1,ntr,1,ns);
+                    free_matrix(sectionvy,1,ntr,1,ns);
+                    free_matrix(sectionp,1,ntr,1,ns);
+                    free_matrix(sectioncurl,1,ntr,1,ns);
+                    free_matrix(sectiondiv,1,ntr,1,ns);
+                }
+                if (WAVETYPE==2 || WAVETYPE==3) {
+                    free_matrix(sectionvz,1,ntr,1,ns);
+                }
+                break;
+            case 5 : /* everything except curl and div */
+                if (WAVETYPE==1 || WAVETYPE==3) {
+                    free_matrix(sectionvx,1,ntr,1,ns);
+                    free_matrix(sectionvy,1,ntr,1,ns);
+                    free_matrix(sectionp,1,ntr,1,ns);
+                }
+                if (WAVETYPE==2 || WAVETYPE==3) {
+                    free_matrix(sectionvz,1,ntr,1,ns);
+                }
+                break;
+        }
+    
+    
+    if (WAVETYPE==1 || WAVETYPE==3) {
+        free_matrix(sectionvxdata,1,ntr,1,ns);
+        free_matrix(sectionvxdiff,1,ntr,1,ns);
+        free_matrix(sectionvydata,1,ntr,1,ns);
+        free_matrix(sectionvydiff,1,ntr,1,ns);
+        free_matrix(sectionvydiffold,1,ntr,1,ns);
+        free_matrix(sectionvxdiffold,1,ntr,1,ns);
+        free_matrix(sectionpdata,1,ntr,1,ns);
+        free_matrix(sectionpdiff,1,ntr,1,ns);
+        free_matrix(sectionpdiffold,1,ntr,1,ns);
+    }
+    if (WAVETYPE==2 || WAVETYPE==3) {
+        free_matrix(sectionvzdata,1,ntr,1,ns);
+        free_matrix(sectionvzdiff,1,ntr,1,ns);
+        free_matrix(sectionvzdiffold,1,ntr,1,ns);
+    }
+ }
\ No newline at end of file

src/calc_misfit.c

@@ -180,8 +180,10 @@ double calc_misfit(float **sectiondata, float **section, int ntr, int ns, int LN
                 abs_sectiondata+=intseis_sectiondata[i][j]*intseis_sectiondata[i][j];
                 abs_section+=intseis_section[i][j]*intseis_section[i][j];
             }
-            abs_sectiondata=sqrt(abs_sectiondata);
-            abs_section=sqrt(abs_section);
+            if (abs_sectiondata==0) abs_sectiondata=1;
+	    else abs_sectiondata=sqrt(abs_sectiondata);
+	    if (abs_section==0) abs_section==1;
+            else abs_section=sqrt(abs_section);
         }
         
         /* calculate L2 residuals */

src/calc_res.c

@@ -207,8 +207,10 @@ double calc_res(float **sectiondata, float **section, float **sectiondiff, float
                 abs_section+=intseis_section[i][j]*intseis_section[i][j];
                 sectiondata_mult_section+=intseis_sectiondata[i][j]*intseis_section[i][j]; /* calculation of dot product for measured (section) and synthetic (sectiondata) data*/
             }
-            abs_sectiondata=sqrt(abs_sectiondata);
-            abs_section=sqrt(abs_section);
+            if (abs_sectiondata==0) abs_sectiondata=1;
+	    else abs_sectiondata=sqrt(abs_sectiondata);
+	    if (abs_section==0) abs_section==1;
+            else abs_section=sqrt(abs_section);
         }
         /* calculate residual seismograms and norm */
         

src/checkfd.c

@@ -277,7 +277,7 @@ void checkfd(FILE *fp, float ** prho, float ** ppi, float ** pu, float ** ptaus,
                   therefore we determine the minimum/maximum position in y-direction by the ZREC1 variable and vice versa.
                   this has to be considered for the receiver line coordinates specified in both the input file and separate source/receiver files*/
 
-		if (READREC==0) {
+		if (READREC==0 || READREC==2) {
 			if (XREC1>XREC2) {
 				srec_maxx=XREC1;
 				srec_minx=XREC2;

src/exchange_par.c

@@ -95,6 +95,7 @@ void exchange_par(void){
     extern int WAVETYPE;
     extern int SOURCE_SHAPE_SH;
     extern int JOINT_INVERSION_PSV_SH_TYPE;
+    extern int JOINT_EQUAL_WEIGHTING;
     /* Workflow  */
     extern char FILE_WORKFLOW[STRING_SIZE];
     extern int USE_WORKFLOW;
@@ -375,6 +376,8 @@ void exchange_par(void){
         idum[115]=TRKILL_STF_OFFSET;
         idum[116]=TRKILL_STF_OFFSET_INVERT;
         
+        idum[117]=JOINT_EQUAL_WEIGHTING;
+        
     } /** if (MYID == 0) **/
     
     MPI_Barrier(MPI_COMM_WORLD);
@@ -660,6 +663,8 @@ void exchange_par(void){
     TRKILL_STF_OFFSET=idum[115];
     TRKILL_STF_OFFSET_INVERT=idum[116];
     
+    JOINT_EQUAL_WEIGHTING=idum[117];
+    
     if ( MYID!=0 && L>0 ) {
         FL=vector(1,L);
     }

src/fd.h

@@ -47,6 +47,10 @@ void spat_filt(float ** waveconv, int iter, int sws);
 
 float norm(float ** waveconv, int iter, int sws);
 
+void alloc_sections(int ntr,int ns,float ***sectionvx,float ***sectionvy,float ***sectionvz,float ***sectionp,float ***sectionpnp1,float ***sectionpn,float ***sectioncurl,float ***sectiondiv,
+                    float ***sectionpdata,float ***sectionpdiff,float ***sectionpdiffold,float ***sectionvxdata,float ***sectionvxdiff,float ***sectionvxdiffold,float ***sectionvydata,
+                    float ***sectionvydiff,float ***sectionvydiffold,float ***sectionvzdata,float ***sectionvzdiff,float ***sectionvzdiffold);
+
 void av_mat(float **  pi, float **  u,
             float **  ppijm, float **  puip, float ** pujm);
 
@@ -95,6 +99,10 @@ void count_killed_traces(int ntr, int swstestshot, int ntr_glob, int **recpos_lo
 
 void create_trkill_table(int ** killtable, int ntr_glob, int **recpos, int nsrc_glob, float **srcpos, int ishot, float kill_offset_lower, float kill_offset_upper);
 
+void dealloc_sections(int ntr,int ns,int **recpos_loc,float **sectionvx,float **sectionvy,float **sectionvz,float **sectionp,float **sectionpnp1,float **sectionpn,float **sectioncurl,float **sectiondiv,
+                    float **sectionpdata,float **sectionpdiff,float **sectionpdiffold,float **sectionvxdata,float **sectionvxdiff,float **sectionvxdiffold,float **sectionvydata,
+                    float **sectionvydiff,float **sectionvydiffold,float **sectionvzdata,float **sectionvzdiff,float **sectionvzdiffold);
+
 float exchange_L2(float L2, int sw, int bcast_l2);
 
 void exchange_rsg(float ** vx, float ** vy, float ** vz,
@@ -226,7 +234,7 @@ void readmod_elastic(float  **  rho, float **  pi, float **  u);
 
 void readmod_elastic_es(float  **  rho, float **  pi, float **  u, float ** matmod, int is);
 
-int **receiver(FILE *fp, int *ntr);
+int **receiver(int* ntr, float** srcpos, int shotno);
 
 void save_checkpoint(int nx1, int nx2, int ny1, int ny2,
                      float **  vx, float ** vy, float ** sxx, float ** syy, float ** sxy);