Changeset 11774

Timestamp:

2019-10-23T16:30:17+02:00 (4 years ago)

Author:

smueller

Message:

Correction of the state-variable advancement in adjoint mode (application of the patch attached to ticket #1443)

File:

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

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

@@ -578 +578 @@
          &                   '  = ', zwtr1, zwtr2
 
-      IF ( kstp /= nit000-1 ) THEN
+      IF ( ( kstp /= nit000-1 ).AND.( kdir == 1 ) ) THEN
          tsb(:,:,:,:) = tsn(:,:,:,:)
          ub(:,:,:) = un(:,:,:)
@@ -591 +591 @@
       tsn(:,:,:,jp_tem)     = zwtr1 * tnr1    (:,:,:) + zwtr2 * tnr2    (:,:,:)
       tsn(:,:,:,jp_sal)     = zwtr1 * snr1    (:,:,:) + zwtr2 * snr2    (:,:,:)
+      IF ( kdir == -1 ) THEN
+         zwtr1  = ( stpr2 - zstp + 1  ) * zden
+         zwtr2  = ( zstp - 1 - stpr1 ) * zden
+         ub(:,:,:)     = zwtr1 * unr1    (:,:,:) + zwtr2 * unr2    (:,:,:)
+         vb(:,:,:)     = zwtr1 * vnr1    (:,:,:) + zwtr2 * vnr2    (:,:,:)
+         tsb(:,:,:,jp_tem)     = zwtr1 * tnr1    (:,:,:) + zwtr2 * tnr2    (:,:,:)
+         tsb(:,:,:,jp_sal)     = zwtr1 * snr1    (:,:,:) + zwtr2 * snr2    (:,:,:)
+         IF(lwp)WRITE(numout,*) ' before lin. interp. coeff.', &
+           &                   '  = ', zwtr1, zwtr2
+
+         zwtr1  = ( stpr2 - zstp      ) * zden
+         zwtr2  = ( zstp  - stpr1     ) * zden      
+      END IF
       IF ( kstp == nit000-1 ) THEN
          tsb(:,:,:,:) = tsn(:,:,:,:)