diff options
| author | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-11-22 11:22:10 -0500 |
|---|---|---|
| committer | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-11-22 11:22:10 -0500 |
| commit | f3a31a7999038451ad6d4d6421a13407bd3c8a22 (patch) | |
| tree | bbf41e9f8fa6ba3edc8b00a441e6f8c19cf7a284 | |
| parent | f2cbd88dbf58715f9931a2ede6860898d965a424 (diff) | |
| parent | 882b0a6498a8f560726132a3c568bf7b31a5454d (diff) | |
Merge branch '8-correct-sfr-geometry-issues-in-module-salt' into 'main'
#8: Correct a regression
See merge request dragon/5.1!27
| -rw-r--r-- | Dragon/src/SAL_GEOMETRY_MOD.f90 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Dragon/src/SAL_GEOMETRY_MOD.f90 b/Dragon/src/SAL_GEOMETRY_MOD.f90 index a56376f..29226cd 100644 --- a/Dragon/src/SAL_GEOMETRY_MOD.f90 +++ b/Dragon/src/SAL_GEOMETRY_MOD.f90 @@ -465,8 +465,8 @@ CONTAINS CALL XABORT(HSMG) ENDIF ELSE IF(TYPGEO.EQ.9) THEN - IF((ANGLE/=0.0).AND.(ANGLE/=PI/6._PDB).AND.(ANGLE/=2._PDB*PI/3._PDB).AND. & - & (ANGLE/=PI).AND.(ANGLE/=7._PDB*PI/6._PDB).AND.(ANGLE/=5._PDB*PI/3._PDB)) THEN + IF((ANGLE/=0.0).AND.(ANGLE/=PI/3._PDB).AND.(ANGLE/=2._PDB*PI/3._PDB).AND. & + & (ANGLE/=PI).AND.(ANGLE/=4._PDB*PI/3._PDB).AND.(ANGLE/=5._PDB*PI/3._PDB)) THEN WRITE(HSMG,100) ANGLE,I,TYPGEO CALL XABORT(HSMG) ENDIF |