Changeset 11432

Timestamp:

2019-08-09T18:26:00+02:00 (5 years ago)

Author:

csanchez

Message:

Added changes from Bijoy to set cpl_mslp in a namelist

Location:

branches/UKMO/r6232_coupling_CBIJ/NEMOGCM/NEMO/OPA_SRC/SBC

Files:

• sbcapr.F90 (modified) (2 diffs)
• sbccpl.F90 (modified) (2 diffs)

branches/UKMO/r6232_coupling_CBIJ/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90

@@ -26 +26 @@
    
    !                                !!* namsbc_apr namelist (Atmospheric PRessure) *
-   LOGICAL, PUBLIC ::   cpl_mslp = .FALSE. ! Is the pressure read from coupling?
+   LOGICAL, PUBLIC ::   cpl_mslp     ! Is the pressure read from coupling?   !CBIJ
    LOGICAL, PUBLIC ::   ln_apr_obc   !: inverse barometer added to OBC ssh data 
    LOGICAL, PUBLIC ::   ln_ref_apr   !: ref. pressure: global mean Patm (F) or a constant (F)
@@ -70 +70 @@
       TYPE(FLD_N)        ::  sn_apr   ! informations about the fields to be read
       !!
-      NAMELIST/namsbc_apr/ cn_dir, sn_apr, ln_ref_apr, rn_pref, ln_apr_obc
+      NAMELIST/namsbc_apr/ cn_dir, sn_apr, ln_ref_apr, rn_pref, ln_apr_obc, cpl_mslp   !CBIJ
       !!----------------------------------------------------------------------
       !

branches/UKMO/r6232_coupling_CBIJ/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -523 +523 @@
       IF( TRIM(sn_rcv_mslp%cldes  ) == 'coupled' ) THEN
          srcv(jpr_mslp)%laction = .TRUE.
-         cpl_mslp = .TRUE.
+!         cpl_mslp = .TRUE. CBIJ
       ENDIF
       
@@ -1178 +1178 @@
       !  
       IF( srcv(jpr_mslp)%laction ) THEN                    ! UKMO SHELF effect of atmospheric pressure on SSH  
-         IF( kt /= nit000 )   ssh_ibb(:,:) = ssh_ib(:,:)    !* Swap of ssh_ib fields  
+         IF ( cpl_mslp) THEN  !CBIJ
+            IF (ln_apr_dyn ) THEN  !CBIJ
+            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( 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
+            !                                                  !* update the reference atmospheric pressure (if necessary)
+            IF( ln_ref_apr )  rn_pref = glob_sum( 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(:,:)
+            !                                         ! ---------------------------------------- !
+            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
             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
-
+            !                                         ! ---------------------------------------- !
+            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
          ! Update mean ssh
-         CALL sbc_ssm_cpl( kt )
-      END IF  
+         IF( nn_components/=jp_iam_sas ) CALL sbc_ssm_cpl( kt )
+       ENDIF  
+      ENDIF  
       ! 
       IF( ln_sdw ) THEN  ! Stokes Drift correction activated