Commit 214d085b authored by Lluis Jofre Cruanyes's avatar Lluis Jofre Cruanyes
Browse files

MOVERS scheme modified II

parent 9b16b90f

src/FlowSolverRHEA.cpp

+7 −7
Original line number Diff line number Diff line
@@ -4510,25 +4510,25 @@ double EckepMoversRHFluxApproximateRiemannSolver::calculateIntercellFlux(const d 
    double deltaF_3 = rho_R*u_R*E_R + P_R*u_R - rho_L*u_L*E_L - P_L*u_L;

   

    /// Wave speed (limited)

    //double S_1 = abs( deltaF_1/( deltaU_1 + epsilon ) );

    double S_1 = abs( deltaF_1/( deltaU_1 + 1.0e-10 ) );				// ... modified for OpenACC

    //double S_1 = deltaF_1/( deltaU_1 + epsilon );

    double S_1 = deltaF_1/( deltaU_1 + 1.0e-10 );					// ... modified for OpenACC

    //if( S_1 > lambda_max ) S_1 = ( S_1/( abs( S_1 ) + epsilon ) )*lambda_max;

    if( S_1 > lambda_max ) S_1 = ( S_1/( abs( S_1 ) + 1.0e-10 ) )*lambda_max;		// ... modified for OpenACC

    //if( S_1 < lambda_min ) S_1 = ( S_1/( abs( S_1 ) + epsilon ) )*lambda_min;

    if( S_1 < lambda_min ) S_1 = ( S_1/( abs( S_1 ) + 1.0e-10 ) )*lambda_min;		// ... modified for OpenACC

    //double S_2 = abs( deltaF_2/( deltaU_2 + epsilon ) );

    double S_2 = abs( deltaF_2/( deltaU_2 + 1.0e-10 ) );				// ... modified for OpenACC

    //double S_2 = deltaF_2/( deltaU_2 + epsilon );

    double S_2 = deltaF_2/( deltaU_2 + 1.0e-10 );					// ... modified for OpenACC

    //if( S_2 > lambda_max ) S_2 = ( S_2/( abs( S_2 ) + epsilon ) )*lambda_max;

    if( S_2 > lambda_max ) S_2 = ( S_2/( abs( S_2 ) + 1.0e-10 ) )*lambda_max;		// ... modified for OpenACC

    //if( S_2 < lambda_min ) S_2 = ( S_2/( abs( S_2 ) + epsilon ) )*lambda_min;

    if( S_2 < lambda_min ) S_2 = ( S_2/( abs( S_2 ) + 1.0e-10 ) )*lambda_min;		// ... modified for OpenACC

    //double S_3 = abs( deltaF_3/( deltaU_3 + epsilon ) );

    double S_3 = abs( deltaF_3/( deltaU_3 + 1.0e-10 ) );				// ... modified for OpenACC

    //double S_3 = deltaF_3/( deltaU_3 + epsilon );

    double S_3 = deltaF_3/( deltaU_3 + 1.0e-10 );					// ... modified for OpenACC

    //if( S_3 > lambda_max ) S_3 = ( S_3/( abs( S_3 ) + epsilon ) )*lambda_max;

    if( S_3 > lambda_max ) S_3 = ( S_3/( abs( S_3 ) + 1.0e-10 ) )*lambda_max;		// ... modified for OpenACC

    //if( S_3 < lambda_min ) S_3 = ( S_3/( abs( S_3 ) + epsilon ) )*lambda_min;

    if( S_3 < lambda_min ) S_3 = ( S_3/( abs( S_3 ) + 1.0e-10 ) )*lambda_min;		// ... modified for OpenACC

    double alpha_S = min( S_1, min( S_2, S_3 ) );

    double alpha_S = min( abs( S_1 ), min( abs( S_2 ), abs( S_3 ) ) );



    /// ---------------------------------///

    /// START: SHOCK SENSOR MODIFICATION ///