From d9689f5a9a812548a6f0acd73825d09f416a078e Mon Sep 17 00:00:00 2001 From: mcgratta Date: Wed, 11 Mar 2026 15:56:24 -0400 Subject: [PATCH] FDS Source: Clean up unnecessary USE statements --- Source/pres.f90 | 57 +++++++++++-------------------------------------- 1 file changed, 13 insertions(+), 44 deletions(-) diff --git a/Source/pres.f90 b/Source/pres.f90 index 4c1f5731ded..5be14cc958c 100644 --- a/Source/pres.f90 +++ b/Source/pres.f90 @@ -1,9 +1,9 @@ -MODULE PRES +!> \brief Find the perturbation pressure by solving Poisson's equation using Crayfishpak FFT-based solver -! Find the perturbation pressure by solving Poisson's Equation +MODULE PRES USE PRECISION_PARAMETERS -USE MESH_VARIABLES +USE MESH_POINTERS IMPLICIT NONE (TYPE,EXTERNAL) PRIVATE @@ -15,11 +15,10 @@ MODULE PRES SUBROUTINE PRESSURE_SOLVER_COMPUTE_RHS(T,DT,NM) -USE MESH_POINTERS USE COMP_FUNCTIONS, ONLY: CURRENT_TIME USE MATH_FUNCTIONS, ONLY: EVALUATE_RAMP -USE GLOBAL_CONSTANTS - +USE GLOBAL_CONSTANTS, ONLY: SOLID_PHASE_ONLY,FREEZE_VELOCITY,PREDICTOR,NEUMANN,DIRICHLET,OPEN_BOUNDARY,INTERPOLATED_BOUNDARY,& + T_BEGIN,U0,V0,W0,OPEN_WIND_BOUNDARY,CYLINDRICAL,T_USED INTEGER, INTENT(IN) :: NM REAL(EB), INTENT(IN) :: T,DT REAL(EB), POINTER, DIMENSION(:,:,:) :: UU,VV,WW,HP,RHOP @@ -318,11 +317,10 @@ END SUBROUTINE PRESSURE_SOLVER_COMPUTE_RHS SUBROUTINE PRESSURE_SOLVER_FFT(NM) -USE MESH_POINTERS USE POIS, ONLY: H3CZSS,H2CZSS,H2CYSS,H3CSSS USE COMP_FUNCTIONS, ONLY: CURRENT_TIME -USE GLOBAL_CONSTANTS - +USE GLOBAL_CONSTANTS, ONLY: SOLID_PHASE_ONLY,FREEZE_VELOCITY,PREDICTOR,TWO_D,CYLINDRICAL,TUNNEL_PRECONDITIONER,H_BAR,I_OFFSET,& + T_USED INTEGER, INTENT(IN) :: NM REAL(EB), POINTER, DIMENSION(:,:,:) :: HP INTEGER :: I,J,K @@ -507,7 +505,9 @@ END SUBROUTINE PRESSURE_SOLVER_FFT SUBROUTINE TUNNEL_POISSON_SOLVER USE MPI_F08 -USE GLOBAL_CONSTANTS +USE GLOBAL_CONSTANTS, ONLY: LOWER_MESH_INDEX,UPPER_MESH_INDEX,PRES_FLAG,ULMAT_FLAG,TP_RDXN,I_OFFSET,NMESHES,& + TP_AA,TP_BB,TP_CC,TP_DD,FISHPAK_BC_DIRICHLET_NEUMANN,FISHPAK_BC_NEUMANN_NEUMANN,& + FISHPAK_BC_NEUMANN_DIRICHLET,TUNNEL_NXP,MY_RANK,DISPLS_TP,COUNTS_TP,H_BAR,T_USED USE COMP_FUNCTIONS, ONLY: CURRENT_TIME REAL(EB) :: RR,DXO,SECTION_AREA_XS,SECTION_AREA_XF INTEGER :: IERR,II,NM,I,J,K @@ -695,10 +695,9 @@ END SUBROUTINE TUNNEL_POISSON_SOLVER SUBROUTINE PRESSURE_SOLVER_CHECK_RESIDUALS(NM) -USE MESH_POINTERS USE COMP_FUNCTIONS, ONLY: CURRENT_TIME -USE GLOBAL_CONSTANTS - +USE GLOBAL_CONSTANTS, ONLY: SOLID_PHASE_ONLY,FREEZE_VELOCITY,PREDICTOR,CHECK_POISSON,ITERATE_BAROCLINIC_TERM,PRESSURE_ERROR_MAX,& + PRESSURE_ERROR_MAX_LOC,STORE_PRESSURE_POISSON_RESIDUAL,T_USED INTEGER, INTENT(IN) :: NM REAL(EB), POINTER, DIMENSION(:,:,:) :: HP,RHOP,P,RESIDUAL INTEGER :: I,J,K @@ -800,7 +799,6 @@ SUBROUTINE COMPUTE_VELOCITY_ERROR(DT,NM) ! Check the maximum velocity error at a solid boundary -USE MESH_POINTERS USE COMP_FUNCTIONS, ONLY: CURRENT_TIME USE GLOBAL_CONSTANTS, ONLY: PREDICTOR,VELOCITY_ERROR_MAX,SOLID_BOUNDARY,INTERPOLATED_BOUNDARY,VELOCITY_ERROR_MAX_LOC,T_USED,& PRES_FLAG,FREEZE_VELOCITY,SOLID_PHASE_ONLY,GLMAT_FLAG,UGLMAT_FLAG,ULMAT_FLAG,CC_IBM @@ -1088,7 +1086,6 @@ MODULE LOCMAT_SOLVER USE PRECISION_PARAMETERS USE GLOBAL_CONSTANTS -USE MESH_VARIABLES USE MESH_POINTERS #ifdef WITH_MKL USE MKL_PARDISO @@ -3034,9 +3031,7 @@ MODULE GLOBMAT_SOLVER USE PRECISION_PARAMETERS USE GLOBAL_CONSTANTS -USE MESH_VARIABLES USE MESH_POINTERS - USE COMPLEX_GEOMETRY, ONLY : CALL_FOR_GLMAT, CC_CGSC,CC_FGSC, CC_UNKH, CC_NCVARS, & NM_START,IPARM,NNZ_ROW_H,CALL_FROM_GLMAT_SETUP USE CC_SCALARS, ONLY : GET_H_CUTFACES, GET_BOUNDFACE_GEOM_INFO_H, ADD_INPLACE_NNZ_H_WHLDOM, & @@ -3129,7 +3124,6 @@ END SUBROUTINE COMPUTE_GUARD_CELL_INDEXES SUBROUTINE GLMAT_SOLVER(T,DT) -USE MESH_POINTERS USE COMP_FUNCTIONS, ONLY: CURRENT_TIME USE CC_SCALARS, ONLY : GET_CUTCELL_HP,GET_PRES_CFACE_BCS,GET_FH_FROM_PRHS_AND_BCS USE MPI_F08 @@ -3623,8 +3617,6 @@ END SUBROUTINE GLMAT_SOLVER_SETUP SUBROUTINE CHECK_UNSUPPORTED_MESH(SUPPORTED_MESH) USE MPI_F08 -USE MESH_POINTERS -USE GLOBAL_CONSTANTS, ONLY : N_MPI_PROCESSES LOGICAL, INTENT(OUT) :: SUPPORTED_MESH @@ -3961,10 +3953,7 @@ END SUBROUTINE COPY_H_OMESH_TO_MESH SUBROUTINE COPY_HS_IN_CCVAR(VAR_CC) -USE MESH_POINTERS INTEGER, INTENT(IN) :: VAR_CC - -! Local Variables: INTEGER :: NM,NOM LOGICAL, PARAMETER :: WRITE_EWC_TYPE = .FALSE. @@ -4032,9 +4021,6 @@ END SUBROUTINE COPY_HS_IN_CCVAR SUBROUTINE WRITE_EWC_TYPE_DIAGNOSTIC -USE MESH_POINTERS - -! Local Variables: INTEGER :: NM,NOM,IW,IIG,JJG,KKG,IOR,IIO,JJO,KKO,BNDRY_TYPE,II_NOM,JJ_NOM,KK_NOM TYPE(WALL_TYPE), POINTER :: WC TYPE(BOUNDARY_COORD_TYPE), POINTER :: BC @@ -4093,10 +4079,7 @@ END SUBROUTINE WRITE_EWC_TYPE_DIAGNOSTIC SUBROUTINE COPY_CCVAR_IN_HS(VAR_CC) -USE MESH_POINTERS INTEGER, INTENT(IN) :: VAR_CC - -! Local Variables: INTEGER :: NM,IW,II,JJ,KK TYPE(WALL_TYPE), POINTER :: WC TYPE(BOUNDARY_COORD_TYPE), POINTER :: BC @@ -4129,6 +4112,7 @@ END SUBROUTINE COPY_CCVAR_IN_HS ! ------------------------------- GET_H_MATRIX_LUDCMP ------------------------------- SUBROUTINE GET_H_MATRIX_LUDCMP + #if defined WITH_MKL || defined WITH_HYPRE USE MPI_F08 #endif @@ -4511,11 +4495,8 @@ END SUBROUTINE SET_CLUSTER_SOLVER_IPARM SUBROUTINE GET_BCS_H_MATRIX USE MPI_F08 -USE MESH_POINTERS USE COMPLEX_GEOMETRY, ONLY : CC_IDRC USE CC_SCALARS, ONLY : GET_CC_UNKH, GET_CFACE_OPEN_BC_COEF - -! Local Variables: INTEGER :: NM,NM1,JLOC,JCOL,IND(LOW_IND:HIGH_IND),IND_LOC(LOW_IND:HIGH_IND),IERR,IIG,JJG,KKG,IW,ILH,JLH,KLH,IRC REAL(EB):: AF,IDX,BIJ TYPE(WALL_TYPE), POINTER :: WC @@ -4606,10 +4587,7 @@ END SUBROUTINE GET_BCS_H_MATRIX SUBROUTINE GET_H_MATRIX -USE MESH_POINTERS USE CC_SCALARS, ONLY : GET_H_MATRIX_CC - -! Local Variables: INTEGER :: NM,NM1,NREG INTEGER :: LOW_FACE,HIGH_FACE,X1AXIS,X2AXIS,X3AXIS,IFACE REAL(EB), POINTER, DIMENSION(:) :: DX1,DX2,DX3 @@ -4883,7 +4861,6 @@ END SUBROUTINE GET_H_MATRIX SUBROUTINE GET_MATRIXGRAPH_H_WHLDOM -USE MESH_POINTERS USE CC_SCALARS, ONLY : GET_CC_MATRIXGRAPH_H, ADD_INPLACE_NNZ_H_WHLDOM USE MPI_F08 @@ -5148,10 +5125,7 @@ END SUBROUTINE GET_MATRIXGRAPH_H_WHLDOM SUBROUTINE GET_H_REGFACES -USE MESH_POINTERS USE CC_SCALARS, ONLY : GET_RCFACES_H - -! Local Variables: INTEGER :: NM INTEGER :: ILO,IHI,JLO,JHI,KLO,KHI INTEGER :: I,J,K,II,IREG,X1AXIS @@ -5313,11 +5287,8 @@ END SUBROUTINE GET_H_REGFACES SUBROUTINE GET_MATRIX_INDEXES_H -USE MESH_POINTERS USE CC_SCALARS, ONLY : NUMBER_UNKH_CUTCELLS USE MPI_F08 - -! Local Variables: INTEGER :: NM INTEGER :: I,J,K,IERR INTEGER, ALLOCATABLE, DIMENSION(:) :: NUNKH_TOT @@ -5491,9 +5462,7 @@ END SUBROUTINE SET_CCVAR_CGSC_H SUBROUTINE PRESSURE_SOLVER_CHECK_RESIDUALS_U(NM) -USE MESH_POINTERS USE COMP_FUNCTIONS, ONLY: CURRENT_TIME -USE GLOBAL_CONSTANTS USE PRES, ONLY : PRESSURE_SOLVER_CHECK_RESIDUALS USE CC_SCALARS, ONLY : UNSTRUCTURED_POISSON_RESIDUAL, UNSTRUCTURED_POISSON_RESIDUAL_RC, & COMPUTE_LINKED_CUTFACE_BAROCLINIC