Changeset 15781

Timestamp:

2022-04-14T18:06:43+02:00 (2 years ago)

Author:

dford

Message:

Revert bug fixes ported from v3.6 which change results.

Location:

NEMO/branches/UKMO/NEMO_4.0.4_FOAM_package_generic_obs/src/OCE

Files:

• DYN/dynspg_ts.F90 (modified) (2 diffs)
• OBS/obs_prep.F90 (modified) (2 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_FOAM_package_generic_obs/src/OCE/DYN/dynspg_ts.F90

@@ -51 +51 @@
    USE agrif_oce
 #endif
+#if defined key_asminc   
+   USE asminc          ! Assimilation increment
+#endif
    !
    USE in_out_manager  ! I/O manager
@@ -338 +341 @@
       ENDIF
       !
+#if defined key_asminc
+      !                                   !=  Add the IAU weighted SSH increment  =!
+      !                                   !  ------------------------------------  !
+      IF( lk_asminc .AND. ln_sshinc .AND. ln_asmiau ) THEN
+         zssh_frc(:,:) = zssh_frc(:,:) - ssh_iau(:,:)
+      ENDIF
+#endif
       !                                   != Fill boundary data arrays for AGRIF
       !                                   ! ------------------------------------

NEMO/branches/UKMO/NEMO_4.0.4_FOAM_package_generic_obs/src/OCE/OBS/obs_prep.F90

@@ -1293 +1293 @@
                &  .OR. ( pobsphi(jobs) >   90.    )       &
                &  .OR. ( pobsdep(jobsp) < 0.0     )       &
-               &  .OR. ( pobsdep(jobsp) > maxdepw ) ) THEN
+               &  .OR. ( pobsdep(jobsp) > gdepw_1d(kpk) ) ) THEN
                kobsqc(jobsp) = IBSET(kobsqc(jobsp),11)
                kosdobs = kosdobs + 1
@@ -1339 +1339 @@
 
             ! Set observation depth equal to that of the first model depth
-            IF ( pobsdep(jobsp) < MINVAL(zgdept(1:2,1:2,1,jobs) ) ) THEN
-               pobsdep(jobsp) = MINVAL(zgdept(1:2,1:2,1,jobs))
-            ENDIF
+            IF ( pobsdep(jobsp) <= pdep(1) ) THEN
+               pobsdep(jobsp) = pdep(1) 
+            ENDIF
+            !IF ( pobsdep(jobsp) < MINVAL(zgdept(1:2,1:2,1,jobs) ) ) THEN
+            !   pobsdep(jobsp) = MINVAL(zgdept(1:2,1:2,1,jobs))
+            !ENDIF
 
             ! Set observation depth equal to that of the last wet T-point
-            IF ( ( pobsdep(jobsp) > maxdept ) .AND. &
-               & ( pobsdep(jobsp) < maxdepw ) ) THEN
-               pobsdep(jobsp) = maxdept
-            END IF
+            !IF ( ( pobsdep(jobsp) > maxdept ) .AND. &
+            !   & ( pobsdep(jobsp) < maxdepw ) ) THEN
+            !   pobsdep(jobsp) = maxdept
+            !END IF
             
             IF (ln_bdy) THEN