From 4ddf3ee0a29bec6471abdbb7ac3bcc06a320f9fc Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Thu, 14 Oct 2021 10:19:04 +0200
Subject: [PATCH] Philippe 14/10/2021: improve slightly
FIND_FIELD_ID_FROM_MNHNAME
---
src/LIB/SURCOUCHE/src/mode_field.f90 | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/LIB/SURCOUCHE/src/mode_field.f90 b/src/LIB/SURCOUCHE/src/mode_field.f90
index 326562a42..89d2b8d16 100644
--- a/src/LIB/SURCOUCHE/src/mode_field.f90
+++ b/src/LIB/SURCOUCHE/src/mode_field.f90
@@ -3151,14 +3151,12 @@ END IF
!
DO
ICOUNT = ICOUNT + 1
- IF (TRIM(TFIELDLIST(IDX)%CMNHNAME)=='') THEN !Last entry
- IDX = 1
- ELSE IF (TRIM(TFIELDLIST(IDX)%CMNHNAME)==TRIM(HMNHNAME)) THEN
+ IF (TRIM(TFIELDLIST(IDX)%CMNHNAME)==TRIM(HMNHNAME)) THEN
KID = IDX
EXIT
- ELSE
+ ELSE
IDX = IDX + 1
- IF (IDX>MAXFIELDS) IDX = 1
+ IF ( IDX > nfields_used ) IDX = 1
END IF
IF (IDX == IFIRSTGUESS) EXIT !All entries have been tested
END DO
@@ -3172,8 +3170,8 @@ IF (KID==0) THEN
CALL PRINT_MSG(NVERB_DEBUG,'GEN','FIND_FIELD_ID_FROM_MNHNAME','field '//TRIM(HMNHNAME)//' not known (not unexpected)')
END IF
ELSE
- IFIRSTGUESS = IDX+1
- IF (IFIRSTGUESS>MAXFIELDS) IFIRSTGUESS = 1
+ IFIRSTGUESS = IDX + 1
+ IF ( IFIRSTGUESS > nfields_used ) IFIRSTGUESS = 1
WRITE(YMSG,'( "field ",A16," found after ",I4," attempt(s)" )') TRIM(HMNHNAME),ICOUNT
CALL PRINT_MSG(NVERB_DEBUG,'GEN','FIND_FIELD_ID_FROM_MNHNAME',TRIM(YMSG))
END IF
--
GitLab