Changeset 15689

Timestamp:

2022-02-03T14:45:19+01:00 (2 years ago)

Author:

hadjt

Message:

Bug Fix

The nambdy_ssh code appears to be added in the wrong place, so has no effect. This may only be a problem when time splitting.

I have moved it up, and it appears to now have an effect

File:

• NEMO/branches/UKMO/NEMO_4.0.4_CO9_shelf_climate/src/OCE/BDY/bdydta.F90 (modified) (2 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_CO9_shelf_climate/src/OCE/BDY/bdydta.F90

@@ -348 +348 @@
       END DO  ! jbdy
 
-      IF ( ln_tide ) THEN
-         IF (ln_dynspg_ts) THEN      ! Fill temporary arrays with slow-varying bdy data                           
-            DO jbdy = 1, nb_bdy      ! Tidal component added in ts loop
-               IF ( nn_dyn2d_dta(jbdy) .GE. 2 ) THEN
-                  IF( ASSOCIATED(dta_bdy(jbdy)%ssh) ) dta_bdy_s(jbdy)%ssh(:) = dta_bdy(jbdy)%ssh(:)
-                  IF( ASSOCIATED(dta_bdy(jbdy)%u2d) ) dta_bdy_s(jbdy)%u2d(:) = dta_bdy(jbdy)%u2d(:)
-                  IF( ASSOCIATED(dta_bdy(jbdy)%v2d) ) dta_bdy_s(jbdy)%v2d(:) = dta_bdy(jbdy)%v2d(:)
-               ENDIF
-            END DO
-         ELSE ! Add tides if not split-explicit free surface else this is done in ts loop
-            !
-            CALL bdy_dta_tides( kt=kt, kt_offset=kt_offset )
-         ENDIF
-      ENDIF
-      
+      !! JT I think this need to go here. The previous location didn't have an affect on the model. 
+      !       I think when time splitting, ln_dynspg_ts, you weren't seeing this effect, so trying it before the time splitting. 
+      !
+      ! 
       ! davbyr - add a shift to the boundary + free elevation Enda, JT from NEMO RAN 3.6
       DO jbdy = 1, nb_bdy
@@ -376 +365 @@
       END DO
       !--- END davbyr
+      !! JT I think this need to go here. 
+
+
+      IF ( ln_tide ) THEN
+         IF (ln_dynspg_ts) THEN      ! Fill temporary arrays with slow-varying bdy data                           
+            DO jbdy = 1, nb_bdy      ! Tidal component added in ts loop
+               IF ( nn_dyn2d_dta(jbdy) .GE. 2 ) THEN
+                  IF( ASSOCIATED(dta_bdy(jbdy)%ssh) ) dta_bdy_s(jbdy)%ssh(:) = dta_bdy(jbdy)%ssh(:)
+                  IF( ASSOCIATED(dta_bdy(jbdy)%u2d) ) dta_bdy_s(jbdy)%u2d(:) = dta_bdy(jbdy)%u2d(:)
+                  IF( ASSOCIATED(dta_bdy(jbdy)%v2d) ) dta_bdy_s(jbdy)%v2d(:) = dta_bdy(jbdy)%v2d(:)
+               ENDIF
+            END DO
+         ELSE ! Add tides if not split-explicit free surface else this is done in ts loop
+            !
+            CALL bdy_dta_tides( kt=kt, kt_offset=kt_offset )
+         ENDIF
+      ENDIF
       
       !