Changeset 15585 for NEMO/branches/UKMO/v15531_cpl-mslp-apr/src

Timestamp:

2021-12-08T10:50:28+01:00 (3 years ago)

Author:

jcastill

Message:

Further fixes to take into account changes in code versions

Location:

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

Files:

• sbccpl.F90 (modified) (1 diff)
• sbcmod.F90 (modified) (1 diff)

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

@@ -1353 +1353 @@
          IF( ln_apr_dyn ) THEN  
             IF( kt /= nit000 )   ssh_ibb(:,:) = ssh_ib(:,:)     !* Swap of ssh_ib fields
-               !                                  !* update the reference atmospheric pressure (if necessary)   
-               IF( ln_ref_apr )  rn_pref = glob_sum( 'sbccpl', frcv(jpr_mslp)%z3(:,:,1) * e1e2t(:,:) ) / tarea
+            !                                  !* update the reference atmospheric pressure (if necessary)   
+            IF( ln_ref_apr )  rn_pref = glob_sum( 'sbccpl', frcv(jpr_mslp)%z3(:,:,1) * e1e2t(:,:) ) / tarea
        
-               ssh_ib(:,:) = - ( frcv(jpr_mslp)%z3(:,:,1) - rn_pref ) * r1_grau  ! equivalent ssh (inverse barometer)   
-               apr   (:,:) =     frcv(jpr_mslp)%z3(:,:,1)                        !atmospheric pressure   
-               !  
-               CALL iom_put( "ssh_ib", ssh_ib )   !* output the inverse barometer ssh  
-               !                                         ! ---------------------------------------- !   
-               IF( kt == nit000 ) THEN                   !   set the forcing field at nit000 - 1    !   
-                  !                                      ! ---------------------------------------- !   
-                  !* Restart: read in restart file   
-                  IF( ln_rstart .AND. iom_varid( numror, 'ssh_ibb', ldstop = .FALSE. ) > 0 ) THEN   
-                     IF(lwp) WRITE(numout,*) 'sbc_cpl:   ssh_ibb read in the restart file'   
-                     CALL iom_get( numror, jpdom_autoglo, 'ssh_ibb', ssh_ibb )   ! before inv. barometer ssh   
-                  ELSE                                         !* no restart: set from nit000 values   
-                     IF(lwp) WRITE(numout,*) 'sbc_cpl:   ssh_ibb set to nit000 values'   
-                     ssh_ibb(:,:) = ssh_ib(:,:)   
-                  ENDIF   
+            ssh_ib(:,:) = - ( frcv(jpr_mslp)%z3(:,:,1) - rn_pref ) * r1_grau  ! equivalent ssh (inverse barometer)   
+            apr   (:,:) =     frcv(jpr_mslp)%z3(:,:,1)                        !atmospheric pressure   
+            !  
+            CALL iom_put( "ssh_ib", ssh_ib )   !* output the inverse barometer ssh  
+            !                                         ! ---------------------------------------- !   
+            IF( kt == nit000 ) THEN                   !   set the forcing field at nit000 - 1    !   
+               !                                      ! ---------------------------------------- !   
+               !* Restart: read in restart file   
+               IF( ln_rstart .AND. iom_varid( numror, 'ssh_ibb', ldstop = .FALSE. ) > 0 ) THEN   
+                  IF(lwp) WRITE(numout,*) 'sbc_cpl:   ssh_ibb read in the restart file'   
+                  CALL iom_get( numror, jpdom_auto, 'ssh_ibb', ssh_ibb )      ! before inv. barometer ssh   
+               ELSE                                         !* no restart: set from nit000 values   
+                  IF(lwp) WRITE(numout,*) 'sbc_cpl:   ssh_ibb set to nit000 values'   
+                  ssh_ibb(:,:) = ssh_ib(:,:)   
                ENDIF   
-               !                                         ! ---------------------------------------- !   
-               IF( lrst_oce ) THEN                       !      Write in the ocean restart file     !   
-                  !                                      ! ---------------------------------------- !   
-                  IF(lwp) WRITE(numout,*)   
-                  IF(lwp) WRITE(numout,*) 'sbc_cpl : ssh_ib written in ocean restart file at it= ', kt,' date= ', ndastp   
-                  IF(lwp) WRITE(numout,*) '~~~~'   
-                  CALL iom_rstput( kt, nitrst, numrow, 'ssh_ibb' , ssh_ib )   
-               ENDIF   
-            ENDIF  
+            ENDIF   
+            !                                         ! ---------------------------------------- !   
+            IF( lrst_oce ) THEN                       !      Write in the ocean restart file     !   
+               !                                      ! ---------------------------------------- !   
+               IF(lwp) WRITE(numout,*)   
+               IF(lwp) WRITE(numout,*) 'sbc_cpl : ssh_ib written in ocean restart file at it= ', kt,' date= ', ndastp   
+               IF(lwp) WRITE(numout,*) '~~~~'   
+               CALL iom_rstput( kt, nitrst, numrow, 'ssh_ibb' , ssh_ib )   
+            ENDIF   
         
             ! Update mean ssh   

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

@@ -441 +441 @@
       IF( ln_mixcpl )          CALL sbc_cpl_rcv   ( kt, nn_fsbc, nn_ice, Kbb, Kmm )  ! forced-coupled mixed formulation after forcing
       !
-      IF( ln_bdy )             CALL bdy_dta ( kt, kt_offset=+1 )                     ! update dynamic & tracer data at open boundaries
+      IF( ln_bdy )             CALL bdy_dta ( kt, Kmm )                              ! update dynamic & tracer data at open boundaries
       !
       IF( ln_wave .AND. ln_tauoc )  THEN            ! Wave stress reduction