Changeset 13422 for NEMO

Timestamp:

2020-08-21T15:10:02+02:00 (4 years ago)

Author:

smueller

Message:

Addition of optional reinitialisation of the trajectory interpolation to subroutine trj_rea

File:

• NEMO/branches/NERC/dev_release-3.4_NEMOTAM_consolidated/NEMOGCM/NEMO/OPATAM_SRC/TAM/trj_tam.F90 (modified) (9 diffs)

NEMO/branches/NERC/dev_release-3.4_NEMOTAM_consolidated/NEMOGCM/NEMO/OPATAM_SRC/TAM/trj_tam.F90

@@ -162 +162 @@
    END SUBROUTINE tl_trj_ini
 
-   SUBROUTINE trj_rea( kstp, kdir )
+   SUBROUTINE trj_rea( kstp, kdir, lreset )
       !!-----------------------------------------------------------------------
       !!
@@ -186 +186 @@
          & kstp, &           ! Step for requested trajectory
          & kdir              ! Direction for stepping (1 forward, -1 backward)
+      LOGICAL, INTENT(in), OPTIONAL :: lreset ! Reset interpolation at given time step (Note, sensitive to value of kdir)
       !! * Local declarations
       CHARACTER (LEN=100) :: &
@@ -203 +204 @@
       ! Initialize data and open file
       !! if step time is corresponding to a saved state
-      IF ( ( MOD( kstp - nit000 + 1, nn_ittrjfrq ) == 0 )  ) THEN
-
-         it = kstp - nit000 + 1
+      IF ( ( MOD( kstp - nit000 + 1, nn_ittrjfrq ) == 0 ) .OR. PRESENT(lreset) ) THEN
+
+         it = ((kstp - nit000 + 1) - MOD(kstp - nit000 + 1, nn_ittrjfrq))
 
          IF ( inumtrj1 == -1 ) THEN
@@ -313 +314 @@
          IF ( ( kstp /= nitend )         .AND. &
             & ( kstp - nit000 + 1 /= 0 ) .AND. &
-            & ( kdir == -1 ) ) THEN
+            & ( kdir == -1 ) .AND. &
+            & .NOT.PRESENT(lreset) ) THEN
 
             stpr2           = stpr1
@@ -385 +387 @@
 
          IF ( ( kstp - nit000 + 1 == 0 ) .AND.( kdir == 1           ) .OR. &
-            & ( kstp - nit000 + 1 /= 0 ) .AND.( kdir == -1          ) ) THEN
+            & ( kstp - nit000 + 1 /= 0 ) .AND.( kdir == -1          ) .OR. &
+            & PRESENT(lreset) ) THEN
 
             IF ( kdir == -1 ) inrcm = inrcm - 1
@@ -452 +455 @@
          IF ( ( kstp - nit000 + 1 /= 0 ) .AND. &
             & ( kstp /= nitend         ) .AND. &
-            & ( kdir == 1              ) ) THEN
+            & ( kdir == 1              ) .AND. &
+            & .NOT.PRESENT(lreset) ) THEN
 
             stpr1           = stpr2
@@ -510 +514 @@
 
          IF ( ( ( kstp /= nitend ) .AND. ( kdir == 1  )) .OR. &
-            &   ( kstp == nitend ) .AND.(  kdir == -1   ) ) THEN
+            &   ( kstp == nitend ) .AND.(  kdir == -1   ) .OR. &
+            & PRESENT(lreset) ) THEN
 
                ! Define the input file
@@ -572 +577 @@
          ENDIF
 
+      ENDIF
+
+      IF ((inumtrj1==-1).OR.(inumtrj2==-1)) THEN
+         IF(lwp) WRITE(numout,*) '   Warning! Trajectory data not available!'
       ENDIF
 
@@ -622 +631 @@
          zwtr2  = ( zstp  - stpr1     ) * zden      
       END IF
-      IF ( kstp == nit000-1 ) THEN
+      IF (( kstp == nit000-1 ).OR.(PRESENT(lreset).AND.(kdir==1))) THEN
          tsb(:,:,:,:) = tsn(:,:,:,:)
          ub(:,:,:) = un(:,:,:)