Changeset 15810

Timestamp:

2022-05-04T16:48:12+02:00 (2 years ago)

Author:

smasson

Message:

replace findloc by a do loop, see #2735

Location:

NEMO/releases/r4.0/r4.0-HEAD/src

Files:

• OCE/IOM/restart.F90 (modified) (2 diffs)
• TOP/trcrst.F90 (modified) (2 diffs)

NEMO/releases/r4.0/r4.0-HEAD/src/OCE/IOM/restart.F90

@@ -59 +59 @@
       INTEGER, INTENT(in) ::   kt     ! ocean time-step
       !!
+      INTEGER             ::   ji
       CHARACTER(LEN=20)   ::   clkt     ! ocean time-step deine as a character
       CHARACTER(LEN=50)   ::   clname   ! ocean output restart file name
@@ -70 +71 @@
          IF( ln_rst_list ) THEN
             ! Protect against user requests outside of simulation period (#2735)
-            nitrst   = MIN( nitend, MINVAL( nn_stocklist, MASK=nn_stocklist.ge.nit000) )  
-            nrst_lst = MAX( 1, FINDLOC( nn_stocklist, nitrst, DIM=1 ) )
+            nitrst   = MIN( nitend, MINVAL( nn_stocklist, MASK=nn_stocklist.GE.nit000) )  
+            ! Fortran 2008 coding style:   nrst_lst = MAX( 1, FINDLOC( nn_stocklist, nitrst, DIM=1 ) )
+            nrst_lst = 1
+            DO ji = 1, SIZE(nn_stocklist)
+               IF( nn_stocklist(ji) == nitrst )   nrst_lst = ji
+            END DO
          ELSE
             nitrst = nitend

NEMO/releases/r4.0/r4.0-HEAD/src/TOP/trcrst.F90

@@ -48 +48 @@
       INTEGER, INTENT(in) ::   kt       ! number of iteration
       !
+      INTEGER             ::   ji
       CHARACTER(LEN=20)   ::   clkt     ! ocean time-step define as a character
       CHARACTER(LEN=50)   ::   clname   ! trc output restart file name
@@ -59 +60 @@
                ! Protect against user requests outside of simulation period (#2735)
                nitrst   = MIN( nitend, MINVAL( nn_stocklist, MASK=nn_stocklist.ge.nit000) )
-               nrst_lst = MAX( 1, FINDLOC( nn_stocklist, nitrst, DIM=1 ) )
+               ! Fortran 2008 coding style:   nrst_lst = MAX( 1, FINDLOC( nn_stocklist, nitrst, DIM=1 ) )
+               nrst_lst = 1
+               DO ji = 1, SIZE(nn_stocklist)
+                  IF( nn_stocklist(ji) == nitrst )   nrst_lst = ji
+               END DO
             ELSE
                nitrst = nitend