mise a jour

src/scheme/FiniteVolumesEulerUnknowns.hpp

@@ -353,7 +353,7 @@ public:
     Kokkos::parallel_for(m_mesh.numberOfCells(), KOKKOS_LAMBDA(const int& j){
 	// Differents k (xi)
   	//m_kj[j] =  xj[j][0];
-	m_kj[j] = 0.014;
+	//m_kj[j] = 0.014;
 
 	// TAC
 	
@@ -392,11 +392,11 @@ public:
 	*/
    
 	// k regulier
-	/*
+	
 	int n = 1;
 	m_kj[j] = std::exp(1.)*std::exp(-1./(1.-( (xj[j][0]-(0.7+0.1/n)) / (0.1/n) )*( (xj[j][0]-(0.7+0.1/n)) / (0.1/n) ))) * (xj[j][0]>0.7)*(xj[j][0]<0.7+0.1/n) + std::exp(1.)*std::exp(-1./(1.-( (xj[j][0]-(0.9-0.1/n)) / (0.1/n) )*( (xj[j][0]-(0.9-0.1/n)) / (0.1/n) ))) * (xj[j][0]>0.9-0.1/n)*(xj[j][0]<0.9) + (xj[j][0]>0.7+0.1/n)*(xj[j][0]<0.9-0.1/n);
-	m_kj[j] = 0.00014*m_kj[j];
-	*/
+	m_kj[j] = 0.014*m_kj[j];
+	
 	
       });
     
@@ -408,8 +408,8 @@ public:
 
     m_uL[0] = zero;
     m_uR[0] = zero;
-    m_kL[0] = 0.014;
-    m_kR[0] = 0.014;
+    m_kL[0] = 0.;
+    m_kR[0] = 0.;
 
     
     Kokkos::parallel_for(m_mesh.numberOfCells(), KOKKOS_LAMBDA(const int& j){  	

src/scheme/Montee.hpp

@@ -152,12 +152,6 @@ private:
 	  const int J = node_cells(r,j);
 	  const int R = node_cell_local_node(r,j);
 
-	  if ((r == 0) or (r == m_mesh.numberOfNodes()-1)) {
-
-	    br += Ajr(J,R)*uj(J) + pj(J)*Cjr(J,R);
-
-	  } else {
-
 	  for (int l=0; l<cell_nb_nodes(J); ++l) {
 	    double sum_p = 0.;
 	    double sum_u = 0.;
@@ -176,7 +170,7 @@ private:
 	  }
 
 	  br += Ajr(J,R)*(uj(J) + (stock_u[1]-stock_u[0])/Vj(J)*(xr[r]-xj[J])) + (pj(J) + (stock_p[1]-stock_p[0])/Vj(J)*(xr[r][0]-xj[J][0]))*Cjr(J,R);
-	  }
+	  
 	}
       });
 
@@ -241,12 +235,6 @@ private:
 	for (int r=0; r<cell_nb_nodes[j]; ++r) {
 	  int R = cell_nodes(j,r);
 
-	  if ((R == 0) or (R == m_mesh.numberOfNodes()-1)) {
-	   
-	    m_Fjr(j,r) = Ajr(j,r)*(uj(j)-ur(R))+pj(j)*Cjr(j,r);
-	  
-	  } else {
-
 	    std::vector<double> stock_p(2);
 	    std::vector<double> stock_u(2);
 
@@ -267,7 +255,7 @@ private:
 	      stock_u[l] = sum_u/sum;
 	    }
 	    m_Fjr(j,r) = Ajr(j,r)*((uj(j)+(stock_u[1]-stock_u[0])/Vj(j)*(xr[R]-xj[j])) - ur(R)) + (pj(j)+(stock_p[1]-stock_p[0])/Vj(j)*(xr[R][0]-xj[j][0]))*Cjr(j,r);
-	  }
+	
 	}
       });