From 73ab5e3d0f12f98e54879db24b143b9a5278e8e8 Mon Sep 17 00:00:00 2001 From: Jean-Matthieu Etancelin <jean-matthieu.etancelin@univ-reims.fr> Date: Fri, 6 Mar 2015 15:51:58 +0100 Subject: [PATCH] ... --- Examples/RMI/RMI_hybrid.py | 6 +++--- HySoP/hysop/operator/discrete/baroclinic.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Examples/RMI/RMI_hybrid.py b/Examples/RMI/RMI_hybrid.py index 31e521d87..6d54c2507 100644 --- a/Examples/RMI/RMI_hybrid.py +++ b/Examples/RMI/RMI_hybrid.py @@ -123,10 +123,10 @@ def calc_maxvelo(simu, v): ctime = MPI.Wtime() # Domain -box = hysop.Box(length=[2., 2., 4.], origin=[-1., -1., -2.], +box = hysop.Box(length=[2., 2., 2.], origin=[-1., -1., -1.], proc_tasks=PROC_TASKS) -bc_b = SubBox(length=[2., 2., 0.1], origin=[-1., -1., -2.], parent=box) -bc_t = SubBox(length=[2., 2., 0.1], origin=[-1., -1., 1.9], parent=box) +bc_b = SubBox(length=[2., 2., 0.1], origin=[-1., -1., -1.], parent=box) +bc_t = SubBox(length=[2., 2., 0.1], origin=[-1., -1., 0.9], parent=box) mpi_params = MPIParams(comm=box.comm_task, task_id=PROC_TASKS[main_rank]) mpi_params_S = MPIParams(comm=box.comm_task, task_id=TASK_SCALAR) mpi_params_UW = MPIParams(comm=box.comm_task, task_id=TASK_UW) diff --git a/HySoP/hysop/operator/discrete/baroclinic.py b/HySoP/hysop/operator/discrete/baroclinic.py index f30ed13a5..62735e443 100644 --- a/HySoP/hysop/operator/discrete/baroclinic.py +++ b/HySoP/hysop/operator/discrete/baroclinic.py @@ -136,7 +136,7 @@ class Baroclinic(DiscreteOperator): self._tempGrad[d][iCompute] *= self.viscosity self._result[d][iCompute] -= self._tempGrad[d][iCompute] # gravity term : result = result - g - self._result[2][iCompute] -= 9.81 + self._result[2][iCompute] -= 1. # 9.81 # baroclinicTerm = -(gradRho/rho) x (gradP/rho) self._tempGrad = self._gradOp(self.density[0:1], self._tempGrad) -- GitLab