Skip to content

Commit 1e3a12d

Browse files
mcgrattamcgratta
authored
Merge pull request #14795 from mcgratta/master
FDS Source: Remove SDV%N_VALUES, not used
2 parents 58e7260 + e7f5244 commit 1e3a12d

File tree

3 files changed

+0
-20
lines changed

3 files changed

+0
-20
lines changed

‎Source/devc.f90‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ MODULE DEVICE_VARIABLES
4646
INTEGER :: I1=-1,I2=-1,J1=-1,J2=-1,K1=-1,K2=-1
4747
!> !\}
4848
INTEGER :: N_PATH=0 !< Number of grid cells along subdevice path for TRANSMISSION or PATH OBSCURATION
49-
INTEGER :: N_VALUES=0 !< Number of values for the subdevice used for computing spatial statistics
5049
!> !\{
5150
!> Grid index for a grid cell along subdevice path for TRANSMISSION or PATH OBSCURATION
5251
INTEGER, ALLOCATABLE, DIMENSION(:) :: I_PATH,J_PATH,K_PATH

‎Source/dump.f90‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6528,7 +6528,6 @@ SUBROUTINE UPDATE_DEVICES_1(T,DT,NM)
65286528
IF (DV%SUBDEVICE_INDEX(NM)==0) CYCLE DEVICE_LOOP
65296529

65306530
SDV => DV%SUBDEVICE(DV%SUBDEVICE_INDEX(NM))
6531-
SDV%N_VALUES = 0 ! Count the number of values for Device N in Mesh NM
65326531

65336532
! Check to see if the device is tied to an INIT line, in which case it is tied to a specific particle. Test to see if the
65346533
! particle is in the current mesh.
@@ -6564,13 +6563,11 @@ SUBROUTINE UPDATE_DEVICES_1(T,DT,NM)
65646563
IF (DV%NO_UPDATE_DEVC_INDEX>0) THEN
65656564
IF (DEVICE(DV%NO_UPDATE_DEVC_INDEX)%CURRENT_STATE) THEN
65666565
SDV%VALUE_1 = DV%SMOOTHED_VALUE
6567-
SDV%N_VALUES = SDV%N_VALUES + 1
65686566
CYCLE DEVICE_LOOP
65696567
ENDIF
65706568
ELSEIF (DV%NO_UPDATE_CTRL_INDEX>0) THEN
65716569
IF (CONTROL(DV%NO_UPDATE_CTRL_INDEX)%CURRENT_STATE) THEN
65726570
SDV%VALUE_1 = DV%SMOOTHED_VALUE
6573-
SDV%N_VALUES = SDV%N_VALUES + 1
65746571
CYCLE DEVICE_LOOP
65756572
ENDIF
65766573
ENDIF
@@ -6606,7 +6603,6 @@ SUBROUTINE UPDATE_DEVICES_1(T,DT,NM)
66066603
SDV%VALUE_1 = SOLID_PHASE_OUTPUT(ABS(DV%QUANTITY_INDEX(1)),DV%Y_INDEX,DV%Z_INDEX,DV%PART_CLASS_INDEX,&
66076604
OPT_CFACE_INDEX=DV%CFACE_INDEX,OPT_DEVC_INDEX=N)
66086605
ENDIF
6609-
SDV%N_VALUES = SDV%N_VALUES + 1
66106606

66116607
CASE DEFAULT SOLID_STATS_SELECT
66126608

@@ -6643,7 +6639,6 @@ SUBROUTINE UPDATE_DEVICES_1(T,DT,NM)
66436639
VALUE = SOLID_PHASE_OUTPUT(ABS(DV%QUANTITY_INDEX(1)),DV%Y_INDEX,DV%Z_INDEX,DV%PART_CLASS_INDEX,&
66446640
OPT_WALL_INDEX=IW,OPT_DEVC_INDEX=N,OPT_CUT_FACE_INDEX=WC%CUT_FACE_INDEX)
66456641
CALL SELECT_SPATIAL_STATISTIC(OPT_CUT_FACE_INDEX=WC%CUT_FACE_INDEX)
6646-
SDV%N_VALUES = SDV%N_VALUES + 1
66476642
ENDDO WALL_CELL_LOOP
66486643

66496644
CFACE_LOOP : DO ICF=INTERNAL_CFACE_CELLS_LB+1,INTERNAL_CFACE_CELLS_LB+N_INTERNAL_CFACE_CELLS
@@ -6660,7 +6655,6 @@ SUBROUTINE UPDATE_DEVICES_1(T,DT,NM)
66606655
VALUE = SOLID_PHASE_OUTPUT(ABS(DV%QUANTITY_INDEX(1)),DV%Y_INDEX,DV%Z_INDEX,DV%PART_CLASS_INDEX,&
66616656
OPT_CFACE_INDEX=ICF,OPT_DEVC_INDEX=N)
66626657
CALL SELECT_SPATIAL_STATISTIC
6663-
SDV%N_VALUES = SDV%N_VALUES + 1
66646658
ENDDO CFACE_LOOP
66656659

66666660
PARTICLE_LOOP: DO IP=1,NLP
@@ -6677,7 +6671,6 @@ SUBROUTINE UPDATE_DEVICES_1(T,DT,NM)
66776671
VALUE = SOLID_PHASE_OUTPUT(ABS(DV%QUANTITY_INDEX(1)),DV%Y_INDEX,DV%Z_INDEX,DV%PART_CLASS_INDEX,&
66786672
OPT_LP_INDEX=IP,OPT_DEVC_INDEX=N)
66796673
CALL SELECT_SPATIAL_STATISTIC(OPT_LP_INDEX=IP)
6680-
SDV%N_VALUES = SDV%N_VALUES + 1
66816674
ENDDO PARTICLE_LOOP
66826675

66836676
! If no WALL, CFACE, or PARTICLE is found, set the value of the device to 0
@@ -6698,7 +6691,6 @@ SUBROUTINE UPDATE_DEVICES_1(T,DT,NM)
66986691
SDV%VALUE_1 = GAS_PHASE_OUTPUT(T,DT,NM,I,J,K,DV%QUANTITY_INDEX(1),0,DV%Y_INDEX,DV%Z_INDEX,DV%ELEM_INDEX,&
66996692
DV%PART_CLASS_INDEX,DV%VELO_INDEX,DV%PIPE_INDEX,DV%PROP_INDEX,DV%REAC_INDEX,&
67006693
DV%MATL_INDEX)
6701-
SDV%N_VALUES = SDV%N_VALUES + 1
67026694

67036695
IF (DV%N_QUANTITY>1) &
67046696
SDV%VALUE_2 = GAS_PHASE_OUTPUT(T,DT,NM,DV%I(2),DV%J(2),DV%K(2),DV%QUANTITY_INDEX(2),0,DV%Y_INDEX,DV%Z_INDEX,&
@@ -6743,7 +6735,6 @@ SUBROUTINE UPDATE_DEVICES_1(T,DT,NM)
67436735
VALUE = GAS_PHASE_OUTPUT(T,DT,NM,I,J,K,DV%QUANTITY_INDEX(1),0,DV%Y_INDEX,DV%Z_INDEX,DV%ELEM_INDEX,&
67446736
DV%PART_CLASS_INDEX,DV%VELO_INDEX,DV%PIPE_INDEX,DV%PROP_INDEX,DV%REAC_INDEX,&
67456737
DV%MATL_INDEX)
6746-
SDV%N_VALUES = SDV%N_VALUES + 1
67476738
STATISTICS_SELECT: SELECT CASE(DV%SPATIAL_STATISTIC)
67486739
CASE('MAX','MAXLOC X','MAXLOC Y','MAXLOC Z')
67496740
IF (VALUE>SDV%VALUE_1) THEN
@@ -6825,7 +6816,6 @@ SUBROUTINE UPDATE_DEVICES_1(T,DT,NM)
68256816
CASE(300:350) OUTPUT_INDEX_SELECT ! HVAC output
68266817

68276818
SDV%VALUE_1 = HVAC_OUTPUT(DV%QUANTITY_INDEX(1),DV%Y_INDEX,DV%Z_INDEX,DV%DUCT_INDEX,DV%NODE_INDEX,DV%DUCT_CELL_INDEX)
6828-
SDV%N_VALUES = SDV%N_VALUES + 1
68296819

68306820
CASE(400:454) OUTPUT_INDEX_SELECT ! Particle-specific output
68316821

@@ -6835,7 +6825,6 @@ SUBROUTINE UPDATE_DEVICES_1(T,DT,NM)
68356825

68366826
IF (LP_INDEX>0) THEN
68376827
SDV%VALUE_1 = PARTICLE_OUTPUT(T,ABS(DV%QUANTITY_INDEX(1)),LP_INDEX)
6838-
SDV%N_VALUES = SDV%N_VALUES + 1
68396828
ENDIF
68406829

68416830
CASE DEFAULT
@@ -6853,7 +6842,6 @@ SUBROUTINE UPDATE_DEVICES_1(T,DT,NM)
68536842
VALUE = PARTICLE_OUTPUT(T,ABS(DV%QUANTITY_INDEX(1)),IP)
68546843
B1 => BOUNDARY_PROP1(LP%B1_INDEX)
68556844
CALL SELECT_SPATIAL_STATISTIC(OPT_LP_INDEX=IP)
6856-
SDV%N_VALUES = SDV%N_VALUES + 1
68576845
ENDDO PARTICLE_LOOP2
68586846

68596847
! If no appropriate particles are found, set the value of the device to 0

‎Source/main.f90‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ PROGRAM FDS
5454
REAL(EB) :: T,DT,TNOW
5555
REAL :: CPUTIME
5656
REAL(EB), ALLOCATABLE, DIMENSION(:) :: TC_ARRAY,DT_NEW
57-
INTEGER, ALLOCATABLE, DIMENSION(:) :: N_VALUES
5857
REAL(EB), ALLOCATABLE, DIMENSION(:,:) :: TC2_ARRAY
5958
LOGICAL, ALLOCATABLE, DIMENSION(:) :: STATE_ARRAY
6059
INTEGER :: ITER
@@ -1140,7 +1139,6 @@ SUBROUTINE MPI_INITIALIZATION_CHORES(TASK_NUMBER)
11401139
ALLOCATE(STATE_ARRAY(2*N_DEVC),STAT=IZERO) ; CALL ChkMemErr('MAIN','STATE_ARRAY',IZERO)
11411140
ALLOCATE(TC_ARRAY(4*N_DEVC),STAT=IZERO) ; CALL ChkMemErr('MAIN','TC_ARRAY',IZERO)
11421141
ALLOCATE(TC2_ARRAY(2,N_DEVC),STAT=IZERO) ; CALL ChkMemErr('MAIN','TC2_ARRAY',IZERO)
1143-
ALLOCATE(N_VALUES(N_DEVC),STAT=IZERO) ; CALL ChkMemErr('MAIN','N_VALUES',IZERO)
11441142

11451143

11461144
CASE(3)
@@ -3950,7 +3948,6 @@ SUBROUTINE EXCHANGE_GLOBAL_OUTPUTS
39503948

39513949
IF (OP_INDEX==2 .AND. .NOT.MIN_DEVICES_EXIST) CYCLE OPERATION_LOOP
39523950
IF (OP_INDEX==3 .AND. .NOT.MAX_DEVICES_EXIST) CYCLE OPERATION_LOOP
3953-
N_VALUES = 0
39543951
SELECT CASE(OP_INDEX)
39553952
CASE(1) ; TC_ARRAY = 0._EB ; MPI_OP_INDEX = MPI_SUM ; DIM_FAC = 4
39563953
CASE(2) ; TC2_ARRAY = 1.E10_EB ; MPI_OP_INDEX = MPI_MINLOC ; DIM_FAC = 1
@@ -3964,7 +3961,6 @@ SUBROUTINE EXCHANGE_GLOBAL_OUTPUTS
39643961
IF (OP_INDEX==3 .AND. DV%SPATIAL_STATISTIC(1:3)/='MAX') CYCLE DEVICE_LOOP_1
39653962
DO NN=1,DV%N_SUBDEVICES
39663963
SDV => DV%SUBDEVICE(NN)
3967-
N_VALUES(N) = N_VALUES(N) + SDV%N_VALUES
39683964
SELECT CASE(OP_INDEX)
39693965
CASE(1)
39703966
TC_ARRAY(N) = TC_ARRAY(N) + SDV%VALUE_1
@@ -3988,7 +3984,6 @@ SUBROUTINE EXCHANGE_GLOBAL_OUTPUTS
39883984
! Perform MPI exchanges to sum or take max/min of device values collected on meshes controlled by different processes
39893985

39903986
IF (N_MPI_PROCESSES>1) THEN
3991-
CALL MPI_ALLREDUCE(MPI_IN_PLACE,N_VALUES,N_DEVC,MPI_INTEGER,MPI_SUM,MPI_COMM_WORLD,IERR)
39923987
SELECT CASE(OP_INDEX)
39933988
CASE(1)
39943989
CALL MPI_ALLREDUCE(MPI_IN_PLACE,TC_ARRAY,DIM_FAC*N_DEVC,MPI_DOUBLE_PRECISION,MPI_OP_INDEX,MPI_COMM_WORLD,IERR)
@@ -4005,8 +4000,6 @@ SUBROUTINE EXCHANGE_GLOBAL_OUTPUTS
40054000
IF (OP_INDEX==1 .AND. (DV%SPATIAL_STATISTIC(1:3)=='MIN' .OR. DV%SPATIAL_STATISTIC(1:3)=='MAX')) CYCLE DEVICE_LOOP_2
40064001
IF (OP_INDEX==2 .AND. DV%SPATIAL_STATISTIC(1:3)/='MIN') CYCLE DEVICE_LOOP_2
40074002
IF (OP_INDEX==3 .AND. DV%SPATIAL_STATISTIC(1:3)/='MAX') CYCLE DEVICE_LOOP_2
4008-
! IF (MY_RANK==0 .AND. N_VALUES(N)==0 .AND. DV%SPATIAL_STATISTIC/='null') &
4009-
! WRITE(LU_ERR,'(3A)') 'WARNING: DEVC ',TRIM(DV%ID),' has no values.'
40104003
IF (OP_INDEX==1) THEN
40114004
DV%VALUE_1 = TC_ARRAY(N)
40124005
DV%VALUE_2 = TC_ARRAY( N_DEVC+N)

0 commit comments

Comments
 (0)