Commit 6f89f6bd authored by laura.gassner's avatar laura.gassner
Browse files

Merge branch 'development' of git.scc.kit.edu:GPIAG-Software/DENISE into development

parents bd997067 d653a65d
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------
* Copyright (C) 2015 For the list of authors, see file AUTHORS. * Copyright (C) 2016 For the list of authors, see file AUTHORS.
* *
* This file is part of DENISE. * This file is part of DENISE.
* *
......
/*----------------------------------------------------------------------------------------- /*-----------------------------------------------------------------------------------------
* Copyright (C) 2013 For the list of authors, see file AUTHORS. * Copyright (C) 2016 For the list of authors, see file AUTHORS.
* *
* This file is part of DENISE. * This file is part of DENISE.
* *
......
/*----------------------------------------------------------------------------------------- /*-----------------------------------------------------------------------------------------
* Copyright (C) 2013 For the list of authors, see file AUTHORS. * Copyright (C) 2016 For the list of authors, see file AUTHORS.
* *
* This file is part of DENISE. * This file is part of DENISE.
* *
......
/*----------------------------------------------------------------------------------------- /*-----------------------------------------------------------------------------------------
* Copyright (C) 2013 For the list of authors, see file AUTHORS. * Copyright (C) 2016 For the list of authors, see file AUTHORS.
* *
* This file is part of DENISE. * This file is part of DENISE.
* *
......
/*----------------------------------------------------------------------------------------- /*-----------------------------------------------------------------------------------------
* Copyright (C) 2015 For the list of authors, see file AUTHORS. * Copyright (C) 2016 For the list of authors, see file AUTHORS.
* *
* This file is part of DENISE. * This file is part of DENISE.
* *
......
/*----------------------------------------------------------------------------------------- /*-----------------------------------------------------------------------------------------
* Copyright (C) 2013 For the list of authors, see file AUTHORS. * Copyright (C) 2016 For the list of authors, see file AUTHORS.
* *
* This file is part of DENISE. * This file is part of DENISE.
* *
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
#include "fd.h" #include "fd.h"
void av_mue(float ** u, float ** uipjp, float ** uip, float ** ujp, float ** rho){ void av_mue(float ** u, float ** uipjp,float ** rho){
extern int NX, NY, INVMAT1, WAVETYPE; extern int NX, NY, INVMAT1;
int i, j; int i, j;
float u1, u2, u3, u4; float u1, u2, u3, u4;
...@@ -31,17 +31,9 @@ void av_mue(float ** u, float ** uipjp, float ** uip, float ** ujp, float ** rho ...@@ -31,17 +31,9 @@ void av_mue(float ** u, float ** uipjp, float ** uip, float ** ujp, float ** rho
for (i=1;i<=NX;i++){ for (i=1;i<=NX;i++){
uipjp[j][i]=4.0/((1.0/u[j][i])+(1.0/u[j][i+1])+(1.0/u[j+1][i])+(1.0/u[j+1][i+1])); uipjp[j][i]=4.0/((1.0/u[j][i])+(1.0/u[j][i+1])+(1.0/u[j+1][i])+(1.0/u[j+1][i+1]));
if(WAVETYPE==2 || WAVETYPE==3) {
uip[j][i]=0.5*(u[j][i+1]+u[j][i]);
ujp[j][i]=0.5*(u[j+1][i]+u[j][i]);
}
if((u[j][i]==0.0)||(u[j][i+1]==0.0)||(u[j+1][i]==0.0)||(u[j+1][i+1]==0.0)){ if((u[j][i]==0.0)||(u[j][i+1]==0.0)||(u[j+1][i]==0.0)||(u[j+1][i+1]==0.0)){
uipjp[j][i]=0.0; uipjp[j][i]=0.0;
if(WAVETYPE==2 || WAVETYPE==3) {
uip[j][i]=0.0;
ujp[j][i]=0.0;
}
} }
...@@ -61,19 +53,10 @@ void av_mue(float ** u, float ** uipjp, float ** uip, float ** ujp, float ** rho ...@@ -61,19 +53,10 @@ void av_mue(float ** u, float ** uipjp, float ** uip, float ** ujp, float ** rho
u4 = rho[j+1][i+1] * u[j+1][i+1] * u[j+1][i+1]; u4 = rho[j+1][i+1] * u[j+1][i+1] * u[j+1][i+1];
uipjp[j][i]=4.0/((1.0/u1)+(1.0/u2)+(1.0/u3)+(1.0/u4)); uipjp[j][i]=4.0/((1.0/u1)+(1.0/u2)+(1.0/u3)+(1.0/u4));
if(WAVETYPE==2 || WAVETYPE==3) {
uip[j][i]=0.5*(u1+u2);
ujp[j][i]=0.5*(u3+u1);
}
if((u1==0.0)||(u2==0.0)||(u3==0.0)||(u4==0.0)){ if((u1==0.0)||(u2==0.0)||(u3==0.0)||(u4==0.0)){
uipjp[j][i]=0.0; uipjp[j][i]=0.0;
if(WAVETYPE==2 || WAVETYPE==3) {
uip[j][i]=0.0;
ujp[j][i]=0.0;
}
} }
} }
} }
......
/*----------------------------------------------------------------------------------------- /*-----------------------------------------------------------------------------------------
* Copyright (C) 2013 For the list of authors, see file AUTHORS. * Copyright (C) 2016 For the list of authors, see file AUTHORS.
* *
* This file is part of DENISE. * This file is part of DENISE.
* *
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
* along with DENISE. See file COPYING and/or <http://www.gnu.org/licenses/gpl-2.0.html>. * along with DENISE. See file COPYING and/or <http://www.gnu.org/licenses/gpl-2.0.html>.
-----------------------------------------------------------------------------------------*/ -----------------------------------------------------------------------------------------*/
/* $Id: av_rho.c,v 1.1.1.1 2007/11/21 22:44:52 koehn Exp $*/
#include "fd.h" #include "fd.h"
void av_rho(float **rho, float **rip, float **rjp){ void av_rho(float **rho, float **rip, float **rjp){
......
/*----------------------------------------------------------------------------------------- /*-----------------------------------------------------------------------------------------
* Copyright (C) 2013 For the list of authors, see file AUTHORS. * Copyright (C) 2016 For the list of authors, see file AUTHORS.
* *
* This file is part of DENISE. * This file is part of DENISE.
* *
...@@ -16,22 +16,16 @@ ...@@ -16,22 +16,16 @@
* along with DENISE. See file COPYING and/or <http://www.gnu.org/licenses/gpl-2.0.html>. * along with DENISE. See file COPYING and/or <http://www.gnu.org/licenses/gpl-2.0.html>.
-----------------------------------------------------------------------------------------*/ -----------------------------------------------------------------------------------------*/
/* $Id: av_tau.c,v 2.4 2007/08/21 13:16:19 tbohlen Exp $*/
#include "fd.h" #include "fd.h"
void av_tau(float **taus, float **tausipjp,float **tausip,float **tausjp){ void av_tau(float **taus, float **tausipjp){
extern int NX, NY, WAVETYPE; extern int NX, NY;
int i, j; int i, j;
for (j=1;j<=NY;j++){ for (j=1;j<=NY;j++){
for (i=1;i<=NX;i++){ for (i=1;i<=NX;i++){
tausipjp[j][i] = 0.25*(taus[j][i]+taus[j][i+1]+taus[j+1][i]+taus[j+1][i+1]); tausipjp[j][i] = 0.25*(taus[j][i]+taus[j][i+1]+taus[j+1][i]+taus[j+1][i+1]);
if(WAVETYPE==2 || WAVETYPE==3) {
tausip[j][i]=0.5*(taus[j][i+1]+taus[j][i]);
tausjp[j][i]=0.5*(taus[j+1][i]+taus[j][i]);
}
} }
} }
} }
/*----------------------------------------------------------------------------------------- /*-----------------------------------------------------------------------------------------
* Copyright (C) 2013 For the list of authors, see file AUTHORS. * Copyright (C) 2016 For the list of authors, see file AUTHORS.
* *
* This file is part of DENISE. * This file is part of DENISE.
* *
......
/*----------------------------------------------------------------------------------------- /*-----------------------------------------------------------------------------------------
* Copyright (C) 2013 For the list of authors, see file AUTHORS. * Copyright (C) 2016 For the list of authors, see file AUTHORS.
* *
* This file is part of DENISE. * This file is part of DENISE.
* *
......
/*----------------------------------------------------------------------------------------- /*-----------------------------------------------------------------------------------------
* Copyright (C) 2013 For the list of authors, see file AUTHORS. * Copyright (C) 2016 For the list of authors, see file AUTHORS.
* *
* This file is part of DENISE. * This file is part of DENISE.
* *
......
/*----------------------------------------------------------------------------------------- /*-----------------------------------------------------------------------------------------
* Copyright (C) 2013 For the list of authors, see file AUTHORS. * Copyright (C) 2016 For the list of authors, see file AUTHORS.
* *
* This file is part of DENISE. * This file is part of DENISE.
* *
......
/*----------------------------------------------------------------------------------------- /*-----------------------------------------------------------------------------------------
* Copyright (C) 2013 For the list of authors, see file AUTHORS. * Copyright (C) 2016 For the list of authors, see file AUTHORS.
* *
* This file is part of DENISE. * This file is part of DENISE.
* *
......
/*----------------------------------------------------------------------------------------- /*-----------------------------------------------------------------------------------------
* Copyright (C) 2013 For the list of authors, see file AUTHORS. * Copyright (C) 2016 For the list of authors, see file AUTHORS.
* *
* This file is part of DENISE. * This file is part of DENISE.
* *
......
/*----------------------------------------------------------------------------------------- /*-----------------------------------------------------------------------------------------
* Copyright (C) 2013 For the list of authors, see file AUTHORS. * Copyright (C) 2016 For the list of authors, see file AUTHORS.
* *
* This file is part of DENISE. * This file is part of DENISE.
* *
......
/*----------------------------------------------------------------------------------------- /*-----------------------------------------------------------------------------------------
* Copyright (C) 2013 For the list of authors, see file AUTHORS. * Copyright (C) 2016 For the list of authors, see file AUTHORS.
* *
* This file is part of DENISE. * This file is part of DENISE.
* *
......
/*----------------------------------------------------------------------------------------- /*-----------------------------------------------------------------------------------------
* Copyright (C) 2013 For the list of authors, see file AUTHORS. * Copyright (C) 2016 For the list of authors, see file AUTHORS.
* *
* This file is part of DENISE. * This file is part of DENISE.
* *
......
/*----------------------------------------------------------------------------------------- /*-----------------------------------------------------------------------------------------
* Copyright (C) 2013 For the list of authors, see file AUTHORS. * Copyright (C) 2016 For the list of authors, see file AUTHORS.
* *
* This file is part of DENISE. * This file is part of DENISE.
* *
......
/*----------------------------------------------------------------------------------------- /*-----------------------------------------------------------------------------------------
* Copyright (C) 2013 For the list of authors, see file AUTHORS. * Copyright (C) 2016 For the list of authors, see file AUTHORS.
* *
* This file is part of DENISE. * This file is part of DENISE.
* *
......
/*----------------------------------------------------------------------------------------- /*-----------------------------------------------------------------------------------------
* Copyright (C) 2013 For the list of authors, see file AUTHORS. * Copyright (C) 2016 For the list of authors, see file AUTHORS.
* *
* This file is part of DENISE. * This file is part of DENISE.
* *
......
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