Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions Source/dump.f90
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ MODULE DUMP
USE CONTROL_VARIABLES
USE OUTPUT_DATA
USE COMPLEX_GEOMETRY, ONLY : WRITE_GEOM,WRITE_GEOM_ALL,CC_FGSC,CC_IDCF,CC_IDCC,CC_UNKZ,CC_UNKF,CC_FTYPE_RCGAS,&
CC_FTYPE_CFGAS,CC_FTYPE_CFINB,CC_SOLID,FCELL,CC_CGSC,CC_CUTCFE,TRIANGULATE,&
CC_FTYPE_CFGAS,CC_FTYPE_CFINB,CC_SOLID,CC_CGSC,CC_CUTCFE,TRIANGULATE,&
CC_VGSC,CC_GASPHASE,MAKE_UNIQUE_VERT_ARRAY,AVERAGE_FACE_VALUES

USE CC_SCALARS, ONLY : ADD_Q_DOT_CUTCELLS,GET_PRES_CFACE,GET_PRES_CFACE_TEST,GET_UVWGAS_CFACE,GET_MUDNS_CFACE
Expand Down Expand Up @@ -4978,7 +4978,7 @@ SUBROUTINE GET_GEOMINFO(SLICETYPE,I1,I2,J1,J2,K1,K2,NVERTS,NVERTS_CUTCELLS,NFACE
I=II; J=JJ; K=KK;
SELECT CASE(X1AXIS)
CASE(IAXIS)
I=II-FCELL+ILH
I=II-1+ILH
DO KADD=-1,0
DO JADD=-1,0
IVERTCUT = IVERTCUT + 1
Expand All @@ -4988,7 +4988,7 @@ SUBROUTINE GET_GEOMINFO(SLICETYPE,I1,I2,J1,J2,K1,K2,NVERTS,NVERTS_CUTCELLS,NFACE
ENDDO
ENDDO
CASE(JAXIS)
J=JJ-FCELL+ILH
J=JJ-1+ILH
DO IADD=-1,0
DO KADD=-1,0
IVERTCUT = IVERTCUT + 1
Expand All @@ -4998,7 +4998,7 @@ SUBROUTINE GET_GEOMINFO(SLICETYPE,I1,I2,J1,J2,K1,K2,NVERTS,NVERTS_CUTCELLS,NFACE
ENDDO
ENDDO
CASE(KAXIS)
K=KK-FCELL+ILH
K=KK-1+ILH
DO JADD=-1,0
DO IADD=-1,0
IVERTCUT = IVERTCUT + 1
Expand Down Expand Up @@ -5637,17 +5637,17 @@ SUBROUTINE GET_SOLIDREGFACE_SCALAR_SLICE(X1AXIS,I,J,K,VAL_CF,&

SELECT CASE(X1AXIS)
CASE(IAXIS)
II_LO=I+FCELL-1; II_HI=I+FCELL
JJ_LO=J; JJ_HI=J
KK_LO=K; KK_HI=K
II_LO=I; II_HI=I+1
JJ_LO=J; JJ_HI=J
KK_LO=K; KK_HI=K
CASE(JAXIS)
II_LO=I; II_HI=I
JJ_LO=J+FCELL-1; JJ_HI=J+FCELL
KK_LO=K; KK_HI=K
II_LO=I; II_HI=I
JJ_LO=J; JJ_HI=J+1
KK_LO=K; KK_HI=K
CASE(KAXIS)
II_LO=I; II_HI=I
JJ_LO=J; JJ_HI=J
KK_LO=K+FCELL-1; KK_HI=K+FCELL
II_LO=I; II_HI=I
JJ_LO=J; JJ_HI=J
KK_LO=K; KK_HI=K+1
END SELECT

SOLID_LO = CCVAR(II_LO,JJ_LO,KK_LO,CC_CGSC)
Expand Down Expand Up @@ -5702,9 +5702,9 @@ SUBROUTINE GET_SOLIDCUTFACE_SCALAR_SLICE(X1AXIS,ICF,VAL_CF, &

SELECT CASE(X1AXIS)
CASE(IAXIS)
II_LO=IJK(IAXIS)+FCELL-1; II_HI=IJK(IAXIS)+FCELL
JJ_LO=IJK(JAXIS)-1; JJ_HI=IJK(JAXIS)+1
KK_LO=IJK(KAXIS)-1; KK_HI=IJK(KAXIS)+1
II_LO=IJK(IAXIS); II_HI=IJK(IAXIS)+1
JJ_LO=IJK(JAXIS)-1; JJ_HI=IJK(JAXIS)+1
KK_LO=IJK(KAXIS)-1; KK_HI=IJK(KAXIS)+1

IJK2(IAXIS:KAXIS, 1) = (/ II_LO, JJ_LO, IJK(KAXIS) /)
IJK2(IAXIS:KAXIS, 2) = (/ II_LO, JJ_HI, IJK(KAXIS) /)
Expand All @@ -5724,9 +5724,9 @@ SUBROUTINE GET_SOLIDCUTFACE_SCALAR_SLICE(X1AXIS,ICF,VAL_CF, &
IJK2(IAXIS:KAXIS,16) = (/ II_HI, JJ_HI, KK_HI /)

CASE(JAXIS)
II_LO=IJK(IAXIS)-1; II_HI=IJK(IAXIS)+1
JJ_LO=IJK(JAXIS)+FCELL-1; JJ_HI=IJK(JAXIS)+FCELL
KK_LO=IJK(KAXIS)-1; KK_HI=IJK(KAXIS)+1
II_LO=IJK(IAXIS)-1; II_HI=IJK(IAXIS)+1
JJ_LO=IJK(JAXIS); JJ_HI=IJK(JAXIS)+1
KK_LO=IJK(KAXIS)-1; KK_HI=IJK(KAXIS)+1

IJK2(IAXIS:KAXIS, 1) = (/ IJK(IAXIS), JJ_LO, KK_LO /)
IJK2(IAXIS:KAXIS, 2) = (/ IJK(IAXIS), JJ_LO, KK_HI /)
Expand All @@ -5746,9 +5746,9 @@ SUBROUTINE GET_SOLIDCUTFACE_SCALAR_SLICE(X1AXIS,ICF,VAL_CF, &
IJK2(IAXIS:KAXIS,16) = (/ II_HI, JJ_HI, KK_HI /)

CASE(KAXIS)
II_LO=IJK(IAXIS)-1; II_HI=IJK(IAXIS)+1
JJ_LO=IJK(JAXIS)-1; JJ_HI=IJK(JAXIS)+1
KK_LO=IJK(KAXIS)+FCELL-1; KK_HI=IJK(KAXIS)+FCELL
II_LO=IJK(IAXIS)-1; II_HI=IJK(IAXIS)+1
JJ_LO=IJK(JAXIS)-1; JJ_HI=IJK(JAXIS)+1
KK_LO=IJK(KAXIS); KK_HI=IJK(KAXIS)+1

IJK2(IAXIS:KAXIS, 1) = (/ II_LO, IJK(JAXIS), KK_LO /)
IJK2(IAXIS:KAXIS, 2) = (/ II_HI, IJK(JAXIS), KK_LO /)
Expand Down
Loading
Loading