This commit is contained in:
James E McClure
2018-05-02 20:51:25 -04:00
parent 24cc133ba7
commit 11a70a1c76
3 changed files with 4 additions and 4 deletions

View File

@@ -2,7 +2,7 @@
// Copyright 2008-2013
#include <stdio.h>
#include <stdlib.h>
#include <iostream>
#include <iostream>C
#include <fstream>
#include <math.h>
#include <time.h>

View File

@@ -1,4 +1,3 @@
#include "common/Domain.h"
#include "common/ScaLBL.h"
ScaLBL_Communicator::ScaLBL_Communicator(Domain &Dm){

View File

@@ -613,7 +613,7 @@ int main(int argc, char **argv)
// compute the gradient
ScaLBL_D3Q19_Gradient_DFH(NeighborList, Phi, Gradient, SolidPotential, ScaLBL_Comm.first_interior, ScaLBL_Comm.last_interior, Np);
ScaLBL_Comm.SendHalo(Phi);
ScaLBL_D3Q19_Gradient_DFH(NeighborList, Phi, Gradient, SolidPotential, 0, ScaLBL_Comm.first_interior, Np);
ScaLBL_D3Q19_Gradient_DFH(NeighborList, Phi, Gradient, SolidPotential, 0, ScaLBL_Comm.next, Np);
ScaLBL_Comm.RecvGrad(Gradient);
// Perform the collision operation
@@ -649,9 +649,10 @@ int main(int argc, char **argv)
// compute the gradient
ScaLBL_D3Q19_Gradient_DFH(NeighborList, Phi, Gradient, SolidPotential, ScaLBL_Comm.first_interior, ScaLBL_Comm.last_interior, Np);
ScaLBL_Comm.SendHalo(Phi);
ScaLBL_D3Q19_Gradient_DFH(NeighborList, Phi, Gradient, SolidPotential, 0, ScaLBL_Comm.first_interior, Np);
ScaLBL_D3Q19_Gradient_DFH(NeighborList, Phi, Gradient, SolidPotential, 0, ScaLBL_Comm.next, Np);
ScaLBL_Comm.RecvGrad(Gradient);
// Perform the collision operation
ScaLBL_Comm.SendD3Q19AA(fq); //READ FORM NORMAL
ScaLBL_D3Q19_AAeven_DFH(NeighborList, fq, Aq, Bq, Den, Phi, Gradient, rhoA, rhoB, tauA, tauB,