No major change, just relabeling

tduretz · Feb 22, 2024 · 3f52e06 · 3f52e06
1 parent c9778c1
commit 3f52e06
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/MDLIB/RiverTomCrouteinf b/MDLIB/RiverTomCrouteinf
diff --git a/MDLIB/Setup.c b/MDLIB/Setup.c
@@ -396,7 +396,7 @@ void SetBCs(SetBCs_ff setBCs, MdoodzInput *instance, grid *mesh, surface *topo)
     instance->topo_height->west = VxWestSum*mesh->dz;
     instance->topo_height->east = VxEastSum*mesh->dz;
   }
-
+  
   /* --------------------------------------------------------------------------------------------------------*/
   /* Set the BCs for Vz on all grid levels */
   /* Type  0: Dirichlet point that matches the physical boundary (Vx:
@@ -468,8 +468,8 @@ void SetBCs(SetBCs_ff setBCs, MdoodzInput *instance, grid *mesh, surface *topo)
     }
   }
 
-  printf("VzWestSum: %f, VzEastSum: %f: \n", VzWestSum, VzEastSum);
-  printf("total West+East+South sum: %f\n", VxWestSum + VxEastSum - VzSouthSum);
+  printf("VxWestSum*dx: %f, VxEastSum*dx: %f, VzEastSum*dz: %f: \n", VxWestSum*mesh->dz, VxEastSum*mesh->dz, VzSouthSum*mesh->dx);
+  printf("Total West+East+South sum: %f\n", fabs(VxWestSum*mesh->dz) + fabs(VxEastSum*mesh->dz)  - fabs(VzSouthSum*mesh->dx) );
 
   if (instance->model.balance_boundaries && (VzSouthSum > tolerance || VzSouthSum < -tolerance)) {
     int zeroValuesCount = 0;

diff --git a/SETS/RiverTomCrouteinf.c b/SETS/RiverTomCrouteinf.c
@@ -102,7 +102,7 @@ SetBC SetBCVx(MdoodzInput *instance, POSITION position, Coordinates coordinates)
   // Assign BC values
   if (position == N || position == S || position == NW || position == SW || position == NE || position == SE) {
     bc.type  = constant_shear_stress;
-    bc.value = 0;
+    bc.value = 0.0;
   } else if (position == W) {
     bc.type  = constant_velocity;
     bc.value = VxW;
@@ -134,16 +134,13 @@ SetBC SetBCVz(MdoodzInput *instance, POSITION position, Coordinates coordinates)
   // const double VzS       = -0.5 * V_tot * (hW + hE) / Lx + Vz_corr;
   const double VxW_H     = instance->topo_height->west;
   const double VxE_H     = instance->topo_height->east;
-  const double VzS       = -(fabs(VxW_H) + fabs(VxE_H))/Lx + Vz_corr;
-
+  const double VzS       = -(fabs(VxW_H) + fabs(VxE_H))/Lx + 2*Vz_corr;
 
   // Here we need the total inflow flux: ncell_W * dz * VxW + ncell_E * dz * VxE
   // ncell_W is the number of Vx points for which we apply a BC value on the west 
   // ncell_E is the number of Vx points for which we apply a BC value on the east
   // Then:  VzS = -(ncell_W * dz * VxW + ncell_E * dz * VxE)/Lx + Vz_corr
 
-// printf("topo_height->west = %2.2e --- topo_height->east = %2.2e ", instance->topo_height->west, instance->topo_height->east);
-
   // Set boundary nodes types and values
   if (position == W || position == SW || position == NW ) {
     bc.type  = constant_shear_stress;