Skip to content

Commit 8ffed23

Browse files
TakisCFDTakisCFD
committed
fix reconstruction gnu compiler bug
1 parent d018352 commit 8ffed23

File tree

1 file changed

+197
-52
lines changed

1 file changed

+197
-52
lines changed

‎src/reconstruct_p.f90

+197-52
Original file line numberDiff line numberDiff line change
@@ -7780,6 +7780,10 @@ SUBROUTINE ARBITRARY_ORDER3(N)
77807780

77817781

77827782
KMAXE=XMPIELRANK(N)
7783+
7784+
7785+
7786+
ielem(n,1:kmaxe)%REDUCE=0
77837787

77847788
SELECT CASE(IWENO)
77857789

@@ -7935,7 +7939,10 @@ SUBROUTINE ARBITRARY_ORDER2(N)
79357939

79367940

79377941
KMAXE=XMPIELRANK(N)
7938-
7942+
7943+
ielem(n,1:kmaxe)%REDUCE=0
7944+
7945+
79397946
SELECT CASE(IWENO)
79407947

79417948

@@ -10498,6 +10505,11 @@ SUBROUTINE CHECKSOL(N)
1049810505
KMAXE=XMPIELRANK(N)
1049910506
jump_cond=0.85
1050010507

10508+
10509+
10510+
10511+
10512+
1050110513
IF (ITESTCASE.GE.3)THEN
1050210514

1050310515
!$OMP DO SCHEDULE (STATIC)
@@ -10529,25 +10541,55 @@ SUBROUTINE CHECKSOL(N)
1052910541

1053010542

1053110543

10532-
IF (((ABS(LEFTV(1)-RIGHTV(1))).GE.(jump_cond*RIGHTV(1))).OR.((ABS(LEFTV(5)-RIGHTV(5))).GE.(jump_cond*RIGHTV(5)))) THEN
10533-
IELEM(N,I)%REDUCE=1
10534-
! PRINT*,"H--1",LEFTV(1),RIGHTV(1)
10544+
if (multispecies.EQ.1)then
1053510545

10536-
END IF
10537-
10538-
10546+
IF (((ABS(LEFTV(8)-RIGHTV(8))).GE.(jump_cond*RIGHTV(8))))then
10547+
REDUCE1=1
10548+
IELEM(N,I)%REDUCE=1
10549+
END IF
1053910550

10540-
if (multispecies.eq.1)then
10551+
IF (leftv(8).lt.0.0)then
10552+
REDUCE1=1
10553+
IELEM(N,I)%REDUCE=1
10554+
END IF
1054110555

10542-
! IF (((ABS(LEFTV(8)-RIGHTV(8))).GE.(jump_cond*RIGHTV(8))).or.(leftv(8).lt.-0.01))then
10543-
! IELEM(N,I)%REDUCE=1
10544-
!
10545-
! END IF
10546-
!
10547-
!
10548-
!
10549-
end if
10550-
10556+
IF (((ABS(LEFTV(1)-RIGHTV(1))).GE.(jump_cond*RIGHTV(1))))then
10557+
REDUCE1=1
10558+
IELEM(N,I)%REDUCE=1
10559+
end if
10560+
10561+
10562+
IF ((LEFTV(1).LT.0.0))then
10563+
REDUCE1=1
10564+
IELEM(N,I)%REDUCE=1
10565+
end if
10566+
10567+
10568+
10569+
IF ((LEFTV(5).LT.0.0))then
10570+
REDUCE1=1
10571+
IELEM(N,I)%REDUCE=1
10572+
end if
10573+
10574+
10575+
10576+
else
10577+
IF (((ABS(LEFTV(1)-RIGHTV(1))).GE.(jump_cond*RIGHTV(1))))then
10578+
REDUCE1=1
10579+
IELEM(N,I)%REDUCE=1
10580+
end if
10581+
10582+
IF (((ABS(LEFTV(5)-RIGHTV(5))).GE.(jump_cond*RIGHTV(5))))then
10583+
REDUCE1=1
10584+
IELEM(N,I)%REDUCE=1
10585+
end if
10586+
10587+
IF ((LEFTV(5).LT.0.0).OR.(LEFTV(1).LT.0.0))then
10588+
REDUCE1=1
10589+
IELEM(N,I)%REDUCE=1
10590+
end if
10591+
10592+
end if
1055110593

1055210594

1055310595
END DO
@@ -10587,13 +10629,16 @@ SUBROUTINE CHECKSOLX(N)
1058710629
KMAXE=XMPIELRANK(N)
1058810630
jump_cond=0.95
1058910631

10632+
10633+
10634+
1059010635
IF (ITESTCASE.GE.3)THEN
1059110636

1059210637
!$OMP DO SCHEDULE (STATIC)
1059310638
DO I=1,KMAXE !ALL ELEMENTS
1059410639

1059510640

10596-
10641+
REDUCE1=0
1059710642

1059810643
if (ielem(n,i)%troubled.eq.1)then
1059910644

@@ -10610,25 +10655,57 @@ SUBROUTINE CHECKSOLX(N)
1061010655
RIGHTV(1:NOF_VARIABLES)=U_C(I)%VAL(1,1:NOF_VARIABLES)
1061110656
CALL CONS2PRIM2(N)
1061210657

10658+
if (multispecies.EQ.1)then
1061310659

10660+
IF (((ABS(LEFTV(8)-RIGHTV(8))).GE.(jump_cond*RIGHTV(8))))then
10661+
REDUCE1=1
10662+
IELEM(N,I)%REDUCE=1
10663+
END IF
1061410664

10615-
IF (((ABS(LEFTV(1)-RIGHTV(1))).GE.(jump_cond*RIGHTV(1))).OR.((ABS(LEFTV(5)-RIGHTV(5))).GE.(jump_cond*RIGHTV(5)))) THEN
10616-
IELEM(N,I)%REDUCE=1
10665+
IF (leftv(8).lt.0.0)then
10666+
REDUCE1=1
10667+
IELEM(N,I)%REDUCE=1
10668+
END IF
1061710669

10670+
IF (((ABS(LEFTV(1)-RIGHTV(1))).GE.(jump_cond*RIGHTV(1))))then
10671+
REDUCE1=1
10672+
IELEM(N,I)%REDUCE=1
10673+
end if
10674+
10675+
10676+
IF ((LEFTV(1).LT.0.0))then
10677+
REDUCE1=1
10678+
IELEM(N,I)%REDUCE=1
10679+
end if
1061810680

10619-
END IF
10620-
if (multispecies.eq.1)then
10621-
! IF (((ABS(LEFTV(7)-RIGHTV(7))).GE.(jump_cond*RIGHTV(7))).or.(leftv(7).lt.zero))then
10622-
! REDUCE1=1
10623-
!
10624-
! END IF
1062510681

10626-
end if
1062710682

10628-
10683+
IF ((LEFTV(5).LT.0.0))then
10684+
REDUCE1=1
10685+
IELEM(N,I)%REDUCE=1
10686+
end if
1062910687

1063010688

1063110689

10690+
else
10691+
IF (((ABS(LEFTV(1)-RIGHTV(1))).GE.(jump_cond*RIGHTV(1))))then
10692+
REDUCE1=1
10693+
IELEM(N,I)%REDUCE=1
10694+
end if
10695+
10696+
IF (((ABS(LEFTV(5)-RIGHTV(5))).GE.(jump_cond*RIGHTV(5))))then
10697+
REDUCE1=1
10698+
IELEM(N,I)%REDUCE=1
10699+
end if
10700+
10701+
IF ((LEFTV(5).LT.0.0).OR.(LEFTV(1).LT.0.0))then
10702+
REDUCE1=1
10703+
IELEM(N,I)%REDUCE=1
10704+
end if
10705+
10706+
end if
10707+
10708+
1063210709
END DO
1063310710
END DO
1063410711

@@ -10712,6 +10789,10 @@ SUBROUTINE CHECKSOL2D(N)
1071210789
KMAXE=XMPIELRANK(N)
1071310790
jump_cond=0.85
1071410791

10792+
10793+
10794+
10795+
1071510796
IF (ITESTCASE.GE.3)THEN
1071610797

1071710798
!$OMP DO SCHEDULE (STATIC)
@@ -10737,23 +10818,48 @@ SUBROUTINE CHECKSOL2D(N)
1073710818

1073810819

1073910820

10740-
IF (((ABS(LEFTV(1)-RIGHTV(1))).GE.(jump_cond*RIGHTV(1))).OR.((ABS(LEFTV(4)-RIGHTV(4))).GE.(jump_cond*RIGHTV(4)))) THEN
10741-
REDUCE1=1
10821+
if (multispecies.EQ.1)then
1074210822

10743-
IELEM(N,I)%REDUCE=1
10744-
10745-
END IF
10746-
if (multispecies.eq.1)then
10823+
IF (((ABS(LEFTV(7)-RIGHTV(7))).GE.(jump_cond*RIGHTV(7))))then
10824+
REDUCE1=1
10825+
IELEM(N,I)%REDUCE=1
10826+
END IF
1074710827

10828+
IF (leftv(7).lt.0.0)then
10829+
REDUCE1=1
10830+
IELEM(N,I)%REDUCE=1
10831+
END IF
1074810832

10749-
! IF (((ABS(LEFTV(7)-RIGHTV(7))).GE.(jump_cond*RIGHTV(7))).or.(leftv(7).lt.-0.00001))then
10750-
! REDUCE1=1
10751-
! IELEM(N,I)%REDUCE=1
10752-
! END IF
10753-
10754-
10755-
10756-
end if
10833+
IF (((ABS(LEFTV(1)-RIGHTV(1))).GE.(jump_cond*RIGHTV(1))))then
10834+
REDUCE1=1
10835+
IELEM(N,I)%REDUCE=1
10836+
end if
10837+
10838+
10839+
IF ((LEFTV(1).LT.0.0))then
10840+
REDUCE1=1
10841+
IELEM(N,I)%REDUCE=1
10842+
end if
10843+
10844+
10845+
10846+
else
10847+
IF (((ABS(LEFTV(1)-RIGHTV(1))).GE.(jump_cond*RIGHTV(1))))then
10848+
REDUCE1=1
10849+
IELEM(N,I)%REDUCE=1
10850+
end if
10851+
10852+
IF (((ABS(LEFTV(4)-RIGHTV(4))).GE.(jump_cond*RIGHTV(4))))then
10853+
REDUCE1=1
10854+
IELEM(N,I)%REDUCE=1
10855+
end if
10856+
10857+
IF ((LEFTV(4).LT.0.0).OR.(LEFTV(1).LT.0.0))then
10858+
REDUCE1=1
10859+
IELEM(N,I)%REDUCE=1
10860+
end if
10861+
10862+
end if
1075710863

1075810864

1075910865

@@ -10790,6 +10896,8 @@ SUBROUTINE CHECKSOL2DX(N)
1079010896
KMAXE=XMPIELRANK(N)
1079110897
jump_cond=0.95
1079210898

10899+
10900+
1079310901
IF (ITESTCASE.GE.3)THEN
1079410902

1079510903
!$OMP DO SCHEDULE (STATIC)
@@ -10809,23 +10917,60 @@ SUBROUTINE CHECKSOL2DX(N)
1080910917

1081010918

1081110919

10812-
IF (((ABS(LEFTV(1)-RIGHTV(1))).GE.(jump_cond*RIGHTV(1))).OR.((ABS(LEFTV(4)-RIGHTV(4))).GE.(jump_cond*RIGHTV(4)))) THEN
10813-
REDUCE1=1
10814-
IELEM(N,I)%REDUCE=1
10920+
if (multispecies.EQ.1)then
1081510921

10922+
IF (((ABS(LEFTV(7)-RIGHTV(7))).GE.(jump_cond*RIGHTV(7))))then
10923+
REDUCE1=1
10924+
IELEM(N,I)%REDUCE=1
10925+
END IF
1081610926

10817-
END IF
10818-
if (multispecies.eq.1)then
10927+
IF (leftv(7).lt.0.0)then
10928+
REDUCE1=1
10929+
IELEM(N,I)%REDUCE=1
10930+
END IF
1081910931

10932+
IF (((ABS(LEFTV(1)-RIGHTV(1))).GE.(jump_cond*RIGHTV(1))))then
10933+
REDUCE1=1
10934+
IELEM(N,I)%REDUCE=1
10935+
end if
10936+
10937+
10938+
IF ((LEFTV(1).LT.0.0))then
10939+
REDUCE1=1
10940+
IELEM(N,I)%REDUCE=1
10941+
end if
10942+
10943+
10944+
10945+
IF ((LEFTV(4).LT.0.0))then
10946+
REDUCE1=1
10947+
IELEM(N,I)%REDUCE=1
10948+
end if
10949+
10950+
10951+
10952+
10953+
10954+
10955+
else
10956+
IF (((ABS(LEFTV(1)-RIGHTV(1))).GE.(jump_cond*RIGHTV(1))))then
10957+
REDUCE1=1
10958+
IELEM(N,I)%REDUCE=1
10959+
end if
10960+
10961+
IF (((ABS(LEFTV(4)-RIGHTV(4))).GE.(jump_cond*RIGHTV(4))))then
10962+
REDUCE1=1
10963+
IELEM(N,I)%REDUCE=1
10964+
end if
1082010965

10821-
! IF (((ABS(LEFTV(7)-RIGHTV(7))).GE.(jump_cond*RIGHTV(7))).or.(leftv(7).lt.zero))then
10822-
! REDUCE1=1
10823-
!
10824-
! END IF
1082510966

1082610967

10968+
IF ((LEFTV(4).LT.0.0).OR.(LEFTV(1).LT.0.0))then
10969+
REDUCE1=1
10970+
IELEM(N,I)%REDUCE=1
10971+
end if
1082710972

10828-
end if
10973+
end if
1082910974

1083010975

1083110976

0 commit comments

Comments
 (0)