diff options
| author | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-11-22 07:38:52 -0500 |
|---|---|---|
| committer | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-11-22 07:38:52 -0500 |
| commit | f2cbd88dbf58715f9931a2ede6860898d965a424 (patch) | |
| tree | a9b59a91a57c54720a4a9361f7665f333ae600ea /Dragon/src/SAL_TRAJECTORY_MOD.f90 | |
| parent | 027a8a12fa3dda8a166855e698d59f5b8cc5e799 (diff) | |
| parent | 6fe47cea54ae9e0cf0f794b53a2276851345f592 (diff) | |
Merge branch '8-correct-sfr-geometry-issues-in-module-salt' into 'main'
#8: Correct a domain translation issue with TSPC tracking
See merge request dragon/5.1!26
Diffstat (limited to 'Dragon/src/SAL_TRAJECTORY_MOD.f90')
| -rw-r--r-- | Dragon/src/SAL_TRAJECTORY_MOD.f90 | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Dragon/src/SAL_TRAJECTORY_MOD.f90 b/Dragon/src/SAL_TRAJECTORY_MOD.f90 index ac1714d..9408d1b 100644 --- a/Dragon/src/SAL_TRAJECTORY_MOD.f90 +++ b/Dragon/src/SAL_TRAJECTORY_MOD.f90 @@ -68,7 +68,7 @@ CONTAINS ! !--------------------------------------------------------------------- ! - USE SAL_GEOMETRY_TYPES, ONLY : ISPEC + USE SAL_GEOMETRY_TYPES, ONLY : ISPEC,TYPGEO USE SAL_TRACKING_TYPES, ONLY : NNN,NMAX2,ITRAC2,ANGTAB,ELMTAB,CNT,CNT0,NB_TOT,DNEW,DINIT, & NNEW,LNEW,IERR,LGMORE,DD0,NTRACK,EPS1,EX0,EY0,LGOK,IPART,DELX, & N_AXIS @@ -110,7 +110,7 @@ CONTAINS ELSE WRITE(*,*) 'PPERIM_MAC2(N_AXIS+1),PPERIM_MAC2(N_AXIS) :',PPERIM_MAC2(N_AXIS+1),PPERIM_MAC2(N_AXIS) WRITE(*,*) 'DIST_AXIS(PPERIM_MAC2(N_AXIS+1)-1) :',DIST_AXIS(PPERIM_MAC2(N_AXIS+1)-1) - WRITE(*,*) 'DELX :',DELX,' RADIA=',RADIA + WRITE(*,*) 'DELX :',DELX,' RADIA=',RADIA,' TYPGEO=',TYPGEO CALL XABORT('SALTRA: Cant find entry point') ENDIF ENDIF @@ -164,6 +164,7 @@ CONTAINS ! !--------------------------------------------------------------------- ! + USE SAL_GEOMETRY_TYPES, ONLY : TYPGEO USE SAL_TRACKING_TYPES, ONLY : IPART,N_AXIS,DNEW,DELX,NNEW,LNEW,COSINE,AX, & AY,HX,HY,BX,BY,EX,EY INTEGER, INTENT(IN) :: NPERIM @@ -171,6 +172,7 @@ CONTAINS REAL(PDB), INTENT(IN), DIMENSION(:) :: DIST_AXIS INTEGER, INTENT(IN), DIMENSION(:,:) :: IPAR INTEGER :: I,J + CHARACTER(LEN=131) :: HSMG !*** LNEW=0 !* compute crossed element @@ -180,7 +182,11 @@ CONTAINS EXIT ENDIF ENDDO - IF(LNEW==0) CALL XABORT('SAL241_2: Error of distances on the axis') + IF(LNEW==0) THEN + WRITE(HSMG,'(52HSAL241_2: Error of distances on the axis for typgeo=, & + & i3,1h.)') TYPGEO + CALL XABORT(HSMG) + ENDIF !* get entered node NNEW=IPAR(2,LNEW) IF(NNEW<0) NNEW=IPAR(3,LNEW) |