Skip to content

Commit

Permalink
Merge pull request #64 from ucns3d-team/dock_Fix
Browse files Browse the repository at this point in the history 
docker fix for gnu compiler and isothermal bc
  • Loading branch information
@TakisCFD
TakisCFD authored Oct 5, 2023
2 parents 6405d1a + 6a0cfc9 commit a88ce98
Show file tree
Hide file tree
Showing 12 changed files with 177 additions and 63 deletions.
30 changes: 17 additions & 13 deletions src/boundf.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,9 @@ SUBROUTINE CALCULATE_BOUNDED_VISCOUS(ICONSIDERED,FACEX,POINTX)
RCVGRAD_T(:,:)=LCVGRAD_T(:,:)
end if
if (B_CODE.eq.4)then

IF (THERMAL.EQ.0)THEN

rightv=zero
rightv(2:4)=LCVGRAD(4,1:3)
leftv=zero
Expand All @@ -301,6 +304,7 @@ SUBROUTINE CALCULATE_BOUNDED_VISCOUS(ICONSIDERED,FACEX,POINTX)
CALL ROTATEB(N,INVTRI,rightv,leftv,ANGLE1,ANGLE2)
RCVGRAD(4,1:3)=rightv(2:4)
end if
END IF
!
!
END IF
Expand Down Expand Up @@ -542,19 +546,19 @@ SUBROUTINE CALCULATE_BOUNDED_VISCOUS2D(ICONSIDERED,FACEX,POINTX)
IF ((TURBULENCE.EQ.1).OR.(PASSIVESCALAR.GT.0))THEN
RCVGRAD_T(:,:)=LCVGRAD_T(:,:)
end if
! if (B_CODE.eq.4)then
!
!
! rightv=zero
! rightv(2:3)=LCVGRAD(3,1:2)
! leftv=zero
!
! CALL ROTATEF2d(N,TRI,leftv,rightv,ANGLE1,ANGLE2) !rotate wrt to normalvector of face and solve 1D Riemann problem
! leftv(2)=-leftv(2)
! CALL ROTATEB2d(N,INVTRI,rightv,leftv,ANGLE1,ANGLE2)
! RCVGRAD(3,1:2)=rightv(2:3)
! end if
!
if (B_CODE.eq.4)then
IF (THERMAL.EQ.0)THEN

rightv=zero
rightv(2:3)=LCVGRAD(3,1:2)
leftv=zero

CALL ROTATEF2d(N,TRI,leftv,rightv,ANGLE1,ANGLE2) !rotate wrt to normalvector of face and solve 1D Riemann problem
leftv(2)=-leftv(2)
CALL ROTATEB2d(N,INVTRI,rightv,leftv,ANGLE1,ANGLE2)
RCVGRAD(3,1:2)=rightv(2:3)
end if
END IF
!
END IF
ELSE
Expand Down
4 changes: 3 additions & 1 deletion src/declarations.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ MODULE DECLARATION
!_____________________________________________ START HEADER OF MODULE______________________________________________________!
!FUNCTION: IS TO COLLECT ALL THE GLOBAL VARIABLES, AND DATA TYPES OF THE CODE IN ONE MODULE
!////////////////////////////////////RESPONSIBLE TSOUTSANIS PANAGIOTIS/////////////////////////////////////////////////////!
!**************************************LAST EDITED ON THE 12-02-2014*******************************************************!
!**************************************************************************************************************************!
!_____________________________________________ END HEADER OF MODULE________________________________________________________!
!--------------------------------------------------------------------------------------------------------------------------!

Expand Down Expand Up @@ -178,6 +178,7 @@ MODULE DECLARATION
INTEGER,ALLOCATABLE,DIMENSION(:)::STCONS !DUMMY VARIABLE FOR RECURSIVE SUBROUTINE OF STENCILS
INTEGER,ALLOCATABLE,DIMENSION(:)::STCONG,LIST,INEB,IPERB,NODELIST !DUMMY VARIABLE FOR RECURSIVE SUBROUTINE OF STENCILS
INTEGER,ALLOCATABLE,DIMENSION(:,:,:,:)::ILOCALALLS !DUMMY VARIABLE FOR RECURSIVE SUBROUTINE OF STENCILS
INTEGER::THERMAL,TEMP_MODEL
!--------------------------------------------------------------------------------------------------------------------------!
!oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! S.3. REAL VARIABLES HERE !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Expand All @@ -196,6 +197,7 @@ MODULE DECLARATION
REAL::Z1,x1c,y1c,h1c,z1c !Z1 COORDINATE FOR BASIS FUNCTION COMPUTATION OF POLYNOMIALS
REAL::TAYLOR,taylor_ens,TAYLOR_ENSX !ONLY TO BE USED FOR TAYLOR GREEN VORTEX
REAL::VOLL !TOTAL VOLUME OF THE DOMAIN
REAL::WALL_TEMP !WALL TEMPERATURE MODEL
REAL::UPTURBLIMIT !UPPER TURBULENCE VISCOSITY RATIO
REAL::HYBRIDIST !UPPER TURBULENCE VISCOSITY RATIO
REAL::VISCOTS !EFFECTIVE VISCOCITY
Expand Down
67 changes: 53 additions & 14 deletions src/gradients.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -730,8 +730,17 @@ SUBROUTINE COMPUTE_GRADIENTS_MIX_MEAN_GGS_VISCOUS_AV(N,ICONSIDERED,NUMBER_OF_DOG
leftv(1:nof_variables)=sols2(1:nof_variables)
call cons2prim(n)
SOLS2(1:nof_variables)=leftv(1:nof_variables)


IF ((B_CODE.EQ.4).and.(thermal.eq.1))THEN

sols2(5)=wall_temp
ELSE



sols2(5)=leftv(5)/leftv(1)

end if



Expand Down Expand Up @@ -1262,13 +1271,13 @@ SUBROUTINE COMPUTE_GRADIENTS_MEAN_LSQ(N,ICONSIDERED,NUMBER_OF_DOG,NUMBER_OF_NEI)
IF(PER_ROT.EQ.1)THEN
IF (ILOCAL_RECON3(I)%PERIODICFLAG(LL,IQ+1).EQ.2) THEN
tempxx=sols2(2,LL)
sols2(2,LL)=tempxx*cosd(angle_per)-sols2(3,LL)*sind(angle_per)
sols2(3,LL)=tempxx*sind(angle_per)+sols2(3,LL)*cosd(angle_per)
sols2(2,LL)=tempxx*cos(angle_per)-sols2(3,LL)*sin(angle_per)
sols2(3,LL)=tempxx*sin(angle_per)+sols2(3,LL)*cos(angle_per)
end if
IF (ILOCAL_RECON3(I)%PERIODICFLAG(LL,IQ+1).EQ.1) THEN
tempxx=sols2(2,LL)
sols2(2,LL)=tempxx*cosd(-angle_per)-sols2(3,LL)*sind(-angle_per)
sols2(3,LL)=tempxx*sind(-angle_per)+sols2(3,LL)*cosd(-angle_per)
sols2(2,LL)=tempxx*cos(-angle_per)-sols2(3,LL)*sin(-angle_per)
sols2(3,LL)=tempxx*sin(-angle_per)+sols2(3,LL)*cos(-angle_per)
END IF
END IF

Expand Down Expand Up @@ -1636,6 +1645,9 @@ SUBROUTINE COMPUTE_GRADIENTS_wall_mean_LSQ_VISCOUS(N,ICONSIDERED,NUMBER_OF_DOG,N

MATRIX_1(2:4,IQ)=MATRIX_1(2:4,IQ)+((SOLS1(2:4)*ILOCAL_RECON3(I)%STENCILS(LL,IQ,K0))/ILOCAL_RECON3(I)%WALLCOEFF(K0))

if (thermal.eq.1)then
MATRIX_1(1,IQ)=MATRIX_1(1,IQ)+((SOLs1(1)*ILOCAL_RECON3(I)%STENCILS(LL,IQ,g0))/ILOCAL_RECON3(I)%WALLCOEFg(g0))-((wall_temp*ILOCAL_RECON3(I)%STENCILS(LL,IQ,g0))/ILOCAL_RECON3(I)%WALLCOEFg(g0))
end if

END DO
matrix_3(1:nof_Variables-1)=-sols1(1:nof_Variables-1)
Expand Down Expand Up @@ -1697,6 +1709,11 @@ SUBROUTINE COMPUTE_GRADIENTS_wall_mean_LSQ_VISCOUS(N,ICONSIDERED,NUMBER_OF_DOG,N
ILOCAL_RECON5(1)%GRADIENTSTEMP(TTK)=SOL_M(IVVM,1)
END DO
ATTT=ZERO
if (thermal.eq.1)then
ATTT=WALL_TEMP-SOLs1(1)
END IF


DO TTK=1,NUMBER_OF_DOG
IF (TTK.NE.G0) &
ATTT=ATTT-ILOCAL_RECON5(1)%GRADIENTSTEMP(TTK)*&
Expand Down Expand Up @@ -2614,6 +2631,7 @@ SUBROUTINE COMPUTE_GRADIENTS_MIX_MEAN_GGS_VISCOUS2d(N,ICONSIDERED,NUMBER_OF_DOG,
DO J=1,IELEM(N,I)%IFCA
FACEX=J

B_CODE=0

ANGLE1=IELEM(N,I)%FACEANGLEX(J)
ANGLE2=IELEM(N,I)%FACEANGLEY(J)
Expand Down Expand Up @@ -2645,6 +2663,11 @@ SUBROUTINE COMPUTE_GRADIENTS_MIX_MEAN_GGS_VISCOUS2d(N,ICONSIDERED,NUMBER_OF_DOG,
CALL BOUNDARYS2d(N,B_CODE,iconsidered)

SOLS2(1:nof_variables)=RIGHTV(1:nof_variables)






END IF
ELSE
Expand Down Expand Up @@ -2680,7 +2703,14 @@ SUBROUTINE COMPUTE_GRADIENTS_MIX_MEAN_GGS_VISCOUS2d(N,ICONSIDERED,NUMBER_OF_DOG,
leftv(1:nof_variables)=sols2(1:nof_variables)
call CONS2PRIM2d(n)
SOLS2(1:nof_variables)=leftv(1:nof_variables)

IF ((B_CODE.EQ.4).and.(thermal.eq.1))THEN

sols2(4)=wall_Temp
ELSE

sols2(4)=leftv(4)/leftv(1)
END IF


DO K=1,2
Expand Down Expand Up @@ -3353,21 +3383,27 @@ SUBROUTINE COMPUTE_GRADIENTS_wall_mean_LSQ_VISCOUS2d(N,ICONSIDERED,NUMBER_OF_DOG


DO IQ=1,imax
if (ilocal_Recon3(i)%local.eq.1)then
LEFTV(1:nof_Variables)=U_C(ILOCAL_RECON3(I)%IHEXL(1,IQ+1))%VAL(1,1:nof_Variables)
else
IF (ILOCAL_RECON3(I)%IHEXB(1,IQ+1).EQ.N)THEN
LEFTV(1:nof_Variables)=U_C(ILOCAL_RECON3(I)%IHEXL(1,IQ+1))%VAL(1,1:nof_Variables)
else
LEFTV(1:nof_Variables)=IEXSOLHIR(ILOCAL_RECON3(I)%IHEXN(1,IQ+1))%SOL(ILOCAL_RECON3(I)%IHEXL(1,IQ+1),1:nof_Variables)
END IF
end if
if (ilocal_Recon3(i)%local.eq.1)then
LEFTV(1:nof_Variables)=U_C(ILOCAL_RECON3(I)%IHEXL(1,IQ+1))%VAL(1,1:nof_Variables)
else
IF (ILOCAL_RECON3(I)%IHEXB(1,IQ+1).EQ.N)THEN
LEFTV(1:nof_Variables)=U_C(ILOCAL_RECON3(I)%IHEXL(1,IQ+1))%VAL(1,1:nof_Variables)
else
LEFTV(1:nof_Variables)=IEXSOLHIR(ILOCAL_RECON3(I)%IHEXN(1,IQ+1))%SOL(ILOCAL_RECON3(I)%IHEXL(1,IQ+1),1:nof_Variables)
END IF
end if

CALL CONS2PRIM2d(N)
SOLS2(2:3)=LEFTV(2:3)
SOLS2(1)=LEFTV(4)/LEFTV(1)
MATRIX_1(1:3,IQ)=(ILOCAL_RECON3(I)%VOLUME(1,IQ+1)*ilocal_recon3(i)%WEIGHTL(1,iq)*(SOLS2(1:3)-SOLS1(1:3)))
MATRIX_1(2:3,IQ)=MATRIX_1(2:3,IQ)+((SOLs1(2:3)*ILOCAL_RECON3(I)%STENCILS(LL,IQ,K0))/ILOCAL_RECON3(I)%WALLCOEFF(K0))

if (thermal.eq.1)then
MATRIX_1(1,IQ)=MATRIX_1(1,IQ)+((SOLs1(1)*ILOCAL_RECON3(I)%STENCILS(LL,IQ,g0))/ILOCAL_RECON3(I)%WALLCOEFg(g0))-((wall_temp*ILOCAL_RECON3(I)%STENCILS(LL,IQ,g0))/ILOCAL_RECON3(I)%WALLCOEFg(g0))
end if


END DO
matrix_3(1:3)=-sols1(1:3)
matrix_3(1)=zero
Expand Down Expand Up @@ -3435,6 +3471,9 @@ SUBROUTINE COMPUTE_GRADIENTS_wall_mean_LSQ_VISCOUS2d(N,ICONSIDERED,NUMBER_OF_DOG
ILOCAL_RECON5(1)%GRADIENTSTEMP(TTK)=SOL_M(ivvm,1)
END DO
ATTT=zero
if (thermal.eq.1)then
ATTT=WALL_TEMP-SOLs1(1)
END IF
DO TTK=1,NUMBER_OF_DOG
IF (TTK.NE.G0) &
ATTT=ATTT-ILOCAL_RECON5(1)%GRADIENTSTEMP(TTK)*&
Expand Down
2 changes: 1 addition & 1 deletion src/grid_p.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1848,7 +1848,7 @@ SUBROUTINE NEIGHBOURSS(N,IELEM,IMAXE,IMAXN,XMPIE,XMPIN,XMPIELRANK,RESTART,INODEr

IF (CODE_PROFILE.EQ.30)THEN
allocate(IELEM(N,I)%NODES_NEIGHBOURS(5,30))
ielem(n,i)%nodes_neighbours=0
IELEM(N,I)%NODES_NEIGHBOURS=0
END IF

allocate(IELEM(N,I)%INEIGHG(5))
Expand Down
16 changes: 8 additions & 8 deletions src/grid_t.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1464,12 +1464,12 @@ subroutine coordinates_face_PERIOD1(n,iconsidered,facex)
if (IELEM(n,i)%reorient(facex).eq.1) then
if (ibound(n,ielem(n,i)%ibounds(facex))%icode.eq.5) then
tempxx=NODES_LIST(k,1)
NODES_LIST(k,1)=tempxx*cosd(-angle_per)-sind(-angle_per)*NODES_LIST(k,2)
NODES_LIST(k,2)=tempxx*sind(-angle_per)+cosd(-angle_per)*NODES_LIST(k,2)
NODES_LIST(k,1)=tempxx*cos(-angle_per)-sin(-angle_per)*NODES_LIST(k,2)
NODES_LIST(k,2)=tempxx*sin(-angle_per)+cos(-angle_per)*NODES_LIST(k,2)
else
tempxx=NODES_LIST(k,1)
NODES_LIST(k,1)=tempxx*cosd(angle_per)-sind(angle_per)*NODES_LIST(k,2)
NODES_LIST(k,2)=tempxx*sind(angle_per)+cosd(angle_per)*NODES_LIST(k,2)
NODES_LIST(k,1)=tempxx*cos(angle_per)-sin(angle_per)*NODES_LIST(k,2)
NODES_LIST(k,2)=tempxx*sin(angle_per)+cos(angle_per)*NODES_LIST(k,2)
end if
end if
END IF
Expand Down Expand Up @@ -1564,12 +1564,12 @@ subroutine coordinates_face_PERIOD(n,iconsidered,facex)
do K=1,nnd
if (ibound(n,ielem(n,i)%ibounds(facex))%icode.eq.5) then
tempxx=NODES_LIST(k,1)
NODES_LIST(k,1)=tempxx*cosd(-angle_per)-sind(-angle_per)*NODES_LIST(k,2)
NODES_LIST(k,2)=tempxx*sind(-angle_per)+cosd(-angle_per)*NODES_LIST(k,2)
NODES_LIST(k,1)=tempxx*cos(-angle_per)-sin(-angle_per)*NODES_LIST(k,2)
NODES_LIST(k,2)=tempxx*sin(-angle_per)+cos(-angle_per)*NODES_LIST(k,2)
else
tempxx=NODES_LIST(k,1)
NODES_LIST(k,1)=tempxx*cosd(angle_per)-sind(angle_per)*NODES_LIST(k,2)
NODES_LIST(k,2)=tempxx*sind(angle_per)+cosd(angle_per)*NODES_LIST(k,2)
NODES_LIST(k,1)=tempxx*cos(angle_per)-sin(angle_per)*NODES_LIST(k,2)
NODES_LIST(k,2)=tempxx*sin(angle_per)+cos(angle_per)*NODES_LIST(k,2)
end if
END DO
end if
Expand Down
6 changes: 3 additions & 3 deletions src/init_p.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ SUBROUTINE INITIALISE(N)
!$OMP END PARALLEL
RES_TIME=ZERO
END IF

INITIALRES=0.0d0



Expand All @@ -531,7 +531,7 @@ SUBROUTINE INITIALISE(N)
!
!
! !Just to assure they are zero if not read
! INITIALRES=ZERO

!
!
!
Expand Down Expand Up @@ -1311,7 +1311,7 @@ SUBROUTINE INITIALISE2d(N)
!$OMP END PARALLEL
RES_TIME=ZERO
END IF

INITIALRES=ZERO


! IF (RESTART.GT.0)THEN !IF_RESTART
Expand Down
5 changes: 5 additions & 0 deletions src/io.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15120,7 +15120,11 @@ SUBROUTINE CALCULATE_RESIDUAL2D(N)
END DO
!$OMP END DO



!$OMP BARRIER
!$OMP MASTER

DO I=1,4
SUML3=ALLRES(I)
DUM_RESI=ZERO
Expand All @@ -15137,6 +15141,7 @@ SUBROUTINE CALCULATE_RESIDUAL2D(N)
ALLRES(I)=ALLRES(I)/INITIALRES(I)

END DO

!$OMP END MASTER


Expand Down
40 changes: 20 additions & 20 deletions src/local_pt.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -679,13 +679,13 @@ SUBROUTINE FIND_ROT_ANGLES(N,ICONSI)
if (IELEM(N,I)%REORIENT(K).EQ.1) then
if (ibound(n,ielem(n,i)%ibounds(K))%icode.eq.5) then
tempxx=vext(kk,1)
vext(kk,1)=tempxx*cosd(-angle_per)-sind(-angle_per)*vext(kk,2)
vext(kk,2)=tempxx*sind(-angle_per)+cosd(-angle_per)*vext(kk,2)
vext(kk,1)=tempxx*cos(-angle_per)-sin(-angle_per)*vext(kk,2)
vext(kk,2)=tempxx*sin(-angle_per)+cos(-angle_per)*vext(kk,2)

else
tempxx=vext(kk,1)
vext(kk,1)=tempxx*cosd(angle_per)-sind(angle_per)*vext(kk,2)
vext(kk,2)=tempxx*sind(angle_per)+cosd(angle_per)*vext(kk,2)
vext(kk,1)=tempxx*cos(angle_per)-sin(angle_per)*vext(kk,2)
vext(kk,2)=tempxx*sin(angle_per)+cos(angle_per)*vext(kk,2)
end if
end if
END IF
Expand Down Expand Up @@ -1243,24 +1243,24 @@ SUBROUTINE LOCALISE_STEN2(N,ICONSI)
ELSE
if (ILOCAL_ELEM(1)%PERIODICFLAG(jj,J).EQ.2) THEN
tempxx=ilocal_elem(1)%XXC(JJ,J)
ilocal_elem(1)%XXC(JJ,J)=tempxx*cosd(angle_per)-ilocal_elem(1)%YYC(JJ,J)*sind(angle_per)
ilocal_elem(1)%YYC(JJ,J)=tempxx*sind(angle_per)+ilocal_elem(1)%YYC(JJ,J)*cosd(angle_per)
ilocal_elem(1)%XXC(JJ,J)=tempxx*cos(angle_per)-ilocal_elem(1)%YYC(JJ,J)*sin(angle_per)
ilocal_elem(1)%YYC(JJ,J)=tempxx*sin(angle_per)+ilocal_elem(1)%YYC(JJ,J)*cos(angle_per)
!write(3300+n,'(6es14.6,I5)'),ilocal_elem(1)%XXC(JJ,1),ilocal_elem(1)%YYC(JJ,1),ilocal_elem(1)%ZZC(JJ,1),ilocal_elem(1)%XXC(JJ,J),ilocal_elem(1)%YYC(JJ,J),ilocal_elem(1)%ZZC(JJ,j),ILOCAL_ELEM(1)%PERIODICFLAG(jj,J)
DO KK=1,8
tempxx=ILOCAL_NODE(1)%X(JJ,J,KK)
ILOCAL_NODE(1)%X(JJ,J,KK)=tempxx*cosd(angle_per)-ILOCAL_NODE(1)%Y(JJ,J,KK)*sind(angle_per)
ILOCAL_NODE(1)%Y(JJ,J,KK)=tempxx*sind(angle_per)+ILOCAL_NODE(1)%Y(JJ,J,KK)*cosd(angle_per)
ILOCAL_NODE(1)%X(JJ,J,KK)=tempxx*cos(angle_per)-ILOCAL_NODE(1)%Y(JJ,J,KK)*sin(angle_per)
ILOCAL_NODE(1)%Y(JJ,J,KK)=tempxx*sin(angle_per)+ILOCAL_NODE(1)%Y(JJ,J,KK)*cos(angle_per)
END DO
end if
if (ILOCAL_ELEM(1)%PERIODICFLAG(jj,J).EQ.1) THEN
tempxx=ilocal_elem(1)%XXC(JJ,J)
ilocal_elem(1)%XXC(JJ,J)=tempxx*cosd(-angle_per)-ilocal_elem(1)%YYC(JJ,J)*sind(-angle_per)
ilocal_elem(1)%YYC(JJ,J)=tempxx*sind(-angle_per)+ilocal_elem(1)%YYC(JJ,J)*cosd(-angle_per)
ilocal_elem(1)%XXC(JJ,J)=tempxx*cos(-angle_per)-ilocal_elem(1)%YYC(JJ,J)*sin(-angle_per)
ilocal_elem(1)%YYC(JJ,J)=tempxx*sin(-angle_per)+ilocal_elem(1)%YYC(JJ,J)*cos(-angle_per)
!write(3300+n,'(6es14.6,I5)'),ilocal_elem(1)%XXC(JJ,1),ilocal_elem(1)%YYC(JJ,1),ilocal_elem(1)%ZZC(JJ,1),ilocal_elem(1)%XXC(JJ,J),ilocal_elem(1)%YYC(JJ,J),ilocal_elem(1)%ZZC(JJ,j),ILOCAL_ELEM(1)%PERIODICFLAG(jj,J)
DO KK=1,8
tempxx=ILOCAL_NODE(1)%X(JJ,J,KK)
ILOCAL_NODE(1)%X(JJ,J,KK)=tempxx*cosd(-angle_per)-ILOCAL_NODE(1)%Y(JJ,J,KK)*sind(-angle_per)
ILOCAL_NODE(1)%Y(JJ,J,KK)=tempxx*sind(-angle_per)+ILOCAL_NODE(1)%Y(JJ,J,KK)*cosd(-angle_per)
ILOCAL_NODE(1)%X(JJ,J,KK)=tempxx*cos(-angle_per)-ILOCAL_NODE(1)%Y(JJ,J,KK)*sin(-angle_per)
ILOCAL_NODE(1)%Y(JJ,J,KK)=tempxx*sin(-angle_per)+ILOCAL_NODE(1)%Y(JJ,J,KK)*cos(-angle_per)
END DO
end if
END IF
Expand Down Expand Up @@ -1607,14 +1607,14 @@ SUBROUTINE LOCALISE_STEN2(N,ICONSI)
if (ibound(n,ielem(n,i)%ibounds(k))%icode.eq.5) then
DO KK=1,n_node
tempxx=vext(kk,1)
vext(kk,1)=tempxx*cosd(-angle_per)-sind(-angle_per)*vext(kk,2)
vext(kk,2)=tempxx*sind(-angle_per)+cosd(-angle_per)*vext(kk,2)
vext(kk,1)=tempxx*cos(-angle_per)-sin(-angle_per)*vext(kk,2)
vext(kk,2)=tempxx*sin(-angle_per)+cos(-angle_per)*vext(kk,2)
END DO
else
DO KK=1,n_node
tempxx=vext(kk,1)
vext(kk,1)=tempxx*cosd(angle_per)-sind(angle_per)*vext(kk,2)
vext(kk,2)=tempxx*sind(angle_per)+cosd(angle_per)*vext(kk,2)
vext(kk,1)=tempxx*cos(angle_per)-sin(angle_per)*vext(kk,2)
vext(kk,2)=tempxx*sin(angle_per)+cos(angle_per)*vext(kk,2)
END DO
end if
END IF
Expand Down Expand Up @@ -1643,14 +1643,14 @@ SUBROUTINE LOCALISE_STEN2(N,ICONSI)
if (ibound(n,ielem(n,i)%ibounds(k))%icode.eq.5) then
DO KK=1,n_node
tempxx=vext(kk,1)
vext(kk,1)=tempxx*cosd(-angle_per)-sind(-angle_per)*vext(kk,2)
vext(kk,2)=tempxx*sind(-angle_per)+cosd(-angle_per)*vext(kk,2)
vext(kk,1)=tempxx*cos(-angle_per)-sin(-angle_per)*vext(kk,2)
vext(kk,2)=tempxx*sin(-angle_per)+cos(-angle_per)*vext(kk,2)
END DO
else
DO KK=1,n_node
tempxx=vext(kk,1)
vext(kk,1)=tempxx*cosd(angle_per)-sind(angle_per)*vext(kk,2)
vext(kk,2)=tempxx*sind(angle_per)+cosd(angle_per)*vext(kk,2)
vext(kk,1)=tempxx*cos(angle_per)-sin(angle_per)*vext(kk,2)
vext(kk,2)=tempxx*sin(angle_per)+cos(angle_per)*vext(kk,2)
END DO
end if
END IF
Expand Down
Loading

0 comments on commit a88ce98

Please sign in to comment.