Commit 1d03a8eb authored by Femi Kadri's avatar Femi Kadri

modified

parent a88dc1fd
......@@ -18,7 +18,6 @@
USE debug_module
USE ieee_arithmetic
!USE precision_detector
IMPLICIT NONE
......@@ -133,7 +132,7 @@ USE ieee_arithmetic
!REAL,DIMENSION(:,:,:),ALLOCATABLE :: local_density_rho,local_velocity_x,local_velocity_y,local_velocity_z
REAL,DIMENSION(:,:,:),ALLOCATABLE :: local_velocity_x
!LOGICAL :: ISNAN
LOGICAL :: ISNAN
INCLUDE "mpif.h"
......@@ -773,9 +772,9 @@ ENDIF !! DEBUG
!CHECK FOR DIVERGENCE (INFINITY) AND STOP IF OCCURED
IF ( IEEE_IS_NAN(global_Ux_max).OR.IEEE_IS_NAN(global_Ux_avg).OR.IEEE_IS_NAN(global_Ux_min) &
& .OR.IEEE_IS_NAN(global_Uy_max).OR.IEEE_IS_NAN(global_Uy_avg).OR.IEEE_IS_NAN(global_Uy_min) &
& .OR.IEEE_IS_NAN(global_Uz_max).OR.IEEE_IS_NAN(global_Uz_avg).OR.IEEE_IS_NAN(global_Uz_min) ) THEN
IF ( ISNAN(global_Ux_max).OR.ISNAN(global_Ux_avg).OR.ISNAN(global_Ux_min) &
& .OR.ISNAN(global_Uy_max).OR.ISNAN(global_Uy_avg).OR.ISNAN(global_Uy_min) &
& .OR.ISNAN(global_Uz_max).OR.ISNAN(global_Uz_avg).OR.ISNAN(global_Uz_min) ) THEN
PRINT*, 'LBM_equilibrate_rhovel ERROR: SIMULATION DIVERGED (TRY CHANGING TAU OR REDUCING Forcing_Factor_x, SUCH THAT Re <10)'
WRITE (0,*) 'LBM_equilibrate_rhovel ERROR: SIMULATION DIVERGED (TRY CHANGING TAU OR REDUCING Forcing_Factor_x, SUCH THAT Re <10)'
......
......@@ -12,7 +12,6 @@ SUBROUTINE LST_time_incriment(local_velocity_field,cartesian_communicator,ROOT,S
USE debug_module
USE precision_detector
USE ieee_arithmetic
IMPLICIT NONE
......@@ -197,7 +196,7 @@ USE ieee_arithmetic
& number_of_std_dev_squared * kinematic_viscosity*Schmidt_Number*global_velocity_magnitude_max) ) / &
& (2.0d0 * Schmidt_Number * global_velocity_magnitude_max**2)
IF( LST_time_increment_max.LE.0.0.OR.IEEE_IS_NAN(LST_time_increment_max) ) THEN
IF( LST_time_increment_max.LE.0.0.OR.ISNAN(LST_time_increment_max) ) THEN
!THIS WAS THE SECOND (LESS CONSERVATIVE) SOLUTION, SINCE ITS A QUADRATIC EQUATION
!(ONLY USE THIS IF THE FIRST SOLUTION GIVES NONPHYSICAL NUMBERS FOR LST_time_increment_max)
......@@ -222,7 +221,7 @@ USE ieee_arithmetic
WRITE (29,*) My_MPI_Process_ID,'LST_time_incriment ERROR: --> LST_time_increment_max.LE.0.0 <--'
STOP
ELSEIF (IEEE_IS_NAN(LST_time_increment_max)) THEN
ELSEIF (ISNAN(LST_time_increment_max)) THEN
PRINT*, My_MPI_Process_ID,'LST_time_incriment ERROR: --> Variable LST_time_increment_max contains a NaN value <--'
IF(debug) WRITE (0,*) My_MPI_Process_ID,'LST_time_incriment ERROR: --> Variable LST_time_increment_max contains a NaN value <--'
IF(debug) WRITE (9,*) My_MPI_Process_ID,'LST_time_incriment ERROR: --> Variable LST_time_increment_max contains a NaN value <--'
......@@ -300,4 +299,4 @@ USE ieee_arithmetic
IF(debug) WRITE (9,*) My_MPI_Process_ID,'about to END SUBROUTINE LST_time_incriment'
RETURN
END SUBROUTINE LST_time_incriment
END SUBROUTINE LST_time_incriment
\ No newline at end of file
......@@ -120,6 +120,7 @@ else if (${MPI_COMPILER} == "pgi") then
#make OPTFLAGS="-fastsse -tp=core2-64" # PGI on sooner
#make OPTFLAGS="-g -gopt -Mbounds -Mchkptr -Mchkfpstk -Mchkstk -fastsse -tp=core2-64" # PGI debug on sooner
if ( ${cluster_name} == "schooner" ) then
make OPTFLAGS="-g -gopt -Mbounds -Mchkptr -Mchkfpstk -Mchkstk -fastsse -tp=haswell-64" # PGI debug on schooner
......
......@@ -9,7 +9,6 @@ SUBROUTINE numerical_2nd_deriv_2nd_order_1D(&
!NUMERICAL APPROXIMATION OF THE 2ND DERIVATIVE USING 4TH ORDER CENTRAL DIFFERENCE FORMULA
USE debug_module
USE ieee_arithmetic
!USE precision_detector
IMPLICIT NONE
......@@ -26,7 +25,7 @@ USE ieee_arithmetic
second_derivative_F = ( forward_F - REAL(2) * F + backward_F )
IF( IEEE_IS_NAN(second_derivative_F) ) THEN
IF( ISNAN(second_derivative_F) ) THEN
IF(debug) WRITE (0,*) My_MPI_Process_ID,'numerical_2nd_deriv_2nd_order_1D: forward_F',forward_F
IF(debug) WRITE (9,*) My_MPI_Process_ID,'numerical_2nd_deriv_2nd_order_1D: forward_F',forward_F
......
......@@ -11,7 +11,6 @@ SUBROUTINE numerical_2nd_deriv_4th_order_1D(&
!NUMERICAL APPROXIMATION OF THE 2ND DERIVATIVE USING 4TH ORDER CENTRAL DIFFERENCE FORMULA
USE debug_module
USE ieee_arithmetic
!USE precision_detector
IMPLICIT NONE
......@@ -32,7 +31,7 @@ USE ieee_arithmetic
& - REAL(30) * F + REAL(16) * backward_F - backward_backward_F ) * Inverse_12
IF( IEEE_IS_NAN(second_derivative_F) ) THEN
IF( ISNAN(second_derivative_F) ) THEN
IF(debug) WRITE (0,*) My_MPI_Process_ID,'numerical_2nd_deriv_4th_order_1D: forward_forward_F',forward_forward_F
IF(debug) WRITE (9,*) My_MPI_Process_ID,'numerical_2nd_deriv_4th_order_1D: forward_forward_F',forward_forward_F
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment