diff options
| author | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-10-22 06:17:28 -0400 |
|---|---|---|
| committer | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-10-22 06:17:28 -0400 |
| commit | 2108052f8d9879e098c619b04dccb82020b8b0c9 (patch) | |
| tree | 13ebfa2d023465fbd3ab54422590fdda05483a48 /Dragon/src | |
| parent | 46a6e3604f7ea10bd35d032bc282c6e031da0779 (diff) | |
| parent | 3b9b6425af90ada817a670222b92e709f3ffde3a (diff) | |
Merge branch '9-implement-option-merg-g2s-quad-in-module-edi' into 'main'
#9: Implement option MERG G2S QUAD in module EDI:
See merge request dragon/5.1!15
Diffstat (limited to 'Dragon/src')
| -rw-r--r-- | Dragon/src/EDIG2S.f90 | 48 |
1 files changed, 46 insertions, 2 deletions
diff --git a/Dragon/src/EDIG2S.f90 b/Dragon/src/EDIG2S.f90 index 24ef2e7..c236d95 100644 --- a/Dragon/src/EDIG2S.f90 +++ b/Dragon/src/EDIG2S.f90 @@ -76,7 +76,7 @@ CONTAINS CALL REDGET(ITYPLU,NMERGE,REALIR,CARLIR,DBLLIR) IF(ITYPLU.NE.1) CALL XABORT('EDIG2S: INTEGER VARIABLE EXPECTED.') IF(NMERGE.LE.0) CALL XABORT('EDIG2S: INVALID VALUE OF NMERGE.') - ALLOCATE(NODE(6,NMERGE),ITNODE(NMERGE)) + ALLOCATE(NODE(8,NMERGE),ITNODE(NMERGE)) DO IM=1,NMERGE CALL REDGET(ITYPLU,INTLIR,REALIR,CARLIR,DBLLIR) IF(ITYPLU.NE.3) CALL XABORT('EDIG2S: CHARACTER VARIABLE EXPECTED.') @@ -95,8 +95,15 @@ CONTAINS IF(ITYPLU.NE.2) CALL XABORT('EDIG2S: REAL VARIABLE EXPECTED(2).') NODE(I,IM)=REALIR ENDDO + ELSE IF(CARLIR.EQ.'QUAD') THEN + ITNODE(IM)=3 + DO I=1,8 + CALL REDGET(ITYPLU,INTLIR,REALIR,CARLIR,DBLLIR) + IF(ITYPLU.NE.2) CALL XABORT('EDIG2S: REAL VARIABLE EXPECTED(3).') + NODE(I,IM)=REALIR + ENDDO ELSE - CALL XABORT('EDIG2S: *RECT* OR *TRIA* KEYWORD EXPECTED.') + CALL XABORT('EDIG2S: *RECT*, *TRIA* OR *QUAD* KEYWORD EXPECTED.') ENDIF ENDDO !---- @@ -177,6 +184,25 @@ CONTAINS IF(IPAR(3).GT.0) ICOUNT(IPAR(3),IM)=ICOUNT(IPAR(3),IM)+1 ENDIF ENDIF + ELSE IF(ITNODE(IM).EQ.3) THEN + ! the quadrilateral is represented as two triangles + DO ITRI=1,2 + TLAMB1=EDIBAR(NODE((ITRI-1)*2+1:(ITRI-1)*2+6,IM),CX,CY) + TLAMB2=EDIBAR(NODE((ITRI-1)*2+1:(ITRI-1)*2+6,IM),DX,DY) + IF((TLAMB1(1).GE.-EPS).AND.(TLAMB1(2).GE.-EPS).AND.(TLAMB1(3).GE.-EPS).AND. & + (TLAMB2(1).GE.-EPS).AND.(TLAMB2(2).GE.-EPS).AND.(TLAMB2(3).GE.-EPS)) THEN + IF((ABS(TLAMB1(1)).LE.EPS).AND.(ABS(TLAMB2(1)).LE.EPS)) THEN + IF(IPAR(3).GT.0) ICOUNT(IPAR(3),IM)=ICOUNT(IPAR(3),IM)+1 + ELSE IF((ABS(TLAMB1(2)).LE.EPS).AND.(ABS(TLAMB2(2)).LE.EPS)) THEN + IF(IPAR(3).GT.0) ICOUNT(IPAR(3),IM)=ICOUNT(IPAR(3),IM)+1 + ELSE IF((ABS(TLAMB1(3)).LE.EPS).AND.(ABS(TLAMB2(3)).LE.EPS)) THEN + IF(IPAR(3).GT.0) ICOUNT(IPAR(3),IM)=ICOUNT(IPAR(3),IM)+1 + ELSE + IF(IPAR(2).GT.0) ICOUNT(IPAR(2),IM)=ICOUNT(IPAR(2),IM)+1 + IF(IPAR(3).GT.0) ICOUNT(IPAR(3),IM)=ICOUNT(IPAR(3),IM)+1 + ENDIF + ENDIF + ENDDO ENDIF ENDDO ELSE IF(ITYPE.EQ.2) THEN @@ -196,6 +222,15 @@ CONTAINS IF(IPAR(2).GT.0) ICOUNT(IPAR(2),IM)=ICOUNT(IPAR(2),IM)+1 IF(IPAR(3).GT.0) ICOUNT(IPAR(3),IM)=ICOUNT(IPAR(3),IM)+1 ENDIF + ELSE IF(ITNODE(IM).EQ.3) THEN + ! the quadrilateral is represented as two triangles + DO ITRI=1,2 + TLAMB1=EDIBAR(NODE((ITRI-1)*2+1:(ITRI-1)*2+6,IM),CX,CY) + IF((TLAMB1(1).GE.-EPS).AND.(TLAMB1(2).GE.-EPS).AND.(TLAMB1(3).GE.-EPS)) THEN + IF(IPAR(2).GT.0) ICOUNT(IPAR(2),IM)=ICOUNT(IPAR(2),IM)+1 + IF(IPAR(3).GT.0) ICOUNT(IPAR(3),IM)=ICOUNT(IPAR(3),IM)+1 + ENDIF + ENDDO ENDIF ENDDO ELSE IF(ITYPE.EQ.3) THEN @@ -221,6 +256,15 @@ CONTAINS IF(IPAR(2).GT.0) ICOUNT(IPAR(2),IM)=ICOUNT(IPAR(2),IM)+1 IF(IPAR(3).GT.0) ICOUNT(IPAR(3),IM)=ICOUNT(IPAR(3),IM)+1 ENDIF + ELSE IF(ITNODE(IM).EQ.3) THEN + ! the quadrilateral is represented as two triangles + DO ITRI=1,2 + TLAMB1=EDIBAR(NODE((ITRI-1)*2+1:(ITRI-1)*2+6,IM),CX,CY) + IF((TLAMB1(1).GE.-EPS).AND.(TLAMB1(2).GE.-EPS).AND.(TLAMB1(3).GE.-EPS)) THEN + IF(IPAR(2).GT.0) ICOUNT(IPAR(2),IM)=ICOUNT(IPAR(2),IM)+1 + IF(IPAR(3).GT.0) ICOUNT(IPAR(3),IM)=ICOUNT(IPAR(3),IM)+1 + ENDIF + ENDDO ENDIF ENDDO ENDIF |