Changeset 15583

Timestamp:

2021-12-08T08:37:56+01:00 (2 years ago)

Author:

jcastill

Message:

Changes due to version differences

Location:

NEMO/branches/UKMO/v15531_cpl-mslp-apr/src/OCE/SBC

Files:

• sbccpl.F90 (modified) (1 diff)
• sbcssm.F90 (modified) (5 diffs)

NEMO/branches/UKMO/v15531_cpl-mslp-apr/src/OCE/SBC/sbccpl.F90

@@ -1383 +1383 @@
         
             ! Update mean ssh   
-            IF( nn_components /= jp_iam_sas ) CALL sbc_ssm_cpl( kt )
+            IF( nn_components /= jp_iam_sas ) CALL sbc_ssm_cpl( kt, Kmm )
          ENDIF
       ENDIF

NEMO/branches/UKMO/v15531_cpl-mslp-apr/src/OCE/SBC/sbcssm.F90

@@ -187 +187 @@
    END SUBROUTINE sbc_ssm
 
-   SUBROUTINE sbc_ssm_cpl( kt )   
+   SUBROUTINE sbc_ssm_cpl( kt, Kmm )   
       !!---------------------------------------------------------------------   
       !!                   ***  ROUTINE sbc_ssm_cpl  ***   
@@ -198 +198 @@
       !!---------------------------------------------------------------------   
       INTEGER, INTENT(in) ::   kt   ! ocean time step   
+      INTEGER, INTENT(in) ::   Kmm  ! ocean time level index
       !   
       REAL(wp) ::   zcoef       ! local scalar   
@@ -204 +205 @@
       IF( nn_fsbc == 1 ) THEN                             !      Instantaneous surface fields        !   
          !                                                ! ---------------------------------------- !   
-         IF( ln_apr_dyn ) THEN   ;   ssh_m(:,:) = sshn(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) )   
-         ELSE                    ;   ssh_m(:,:) = sshn(:,:)   
+         IF( ln_apr_dyn ) THEN   ;   ssh_m(:,:) = ssh(:,:,Kmm) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) )   
+         ELSE                    ;   ssh_m(:,:) = ssh(:,:,Kmm)   
          ENDIF   
       ELSE   
@@ -215 +216 @@
             zcoef = REAL( nn_fsbc - 1, wp )   
             zcoef = REAL( nn_fsbc - 1, wp )   
-            IF( ln_apr_dyn ) THEN    ;  ssh_m(:,:) = zcoef * ( sshn(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) )   
-            ELSE                     ;  ssh_m(:,:) = zcoef * sshn(:,:)   
+            IF( ln_apr_dyn ) THEN    ;  ssh_m(:,:) = zcoef * ( ssh(:,:,Kmm) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) )   
+            ELSE                     ;  ssh_m(:,:) = zcoef *   ssh(:,:,Kmm)   
             ENDIF   
             !                                             ! ---------------------------------------- !   
@@ -224 +225 @@
          ENDIF   
      
-         IF( ln_apr_dyn ) THEN   ;   ssh_m(:,:) = ssh_m(:,:) + sshn(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) )   
-         ELSE                    ;   ssh_m(:,:) = ssh_m(:,:) + sshn(:,:)   
+         IF( ln_apr_dyn ) THEN   ;   ssh_m(:,:) = ssh_m(:,:) + ssh(:,:,Kmm) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) )   
+         ELSE                    ;   ssh_m(:,:) = ssh_m(:,:) + ssh(:,:,Kmm)   
          ENDIF   
          !                                                ! ---------------------------------------- !