Changeset 15658 for NEMO/branches/UKMO/NEMO_4.0.4_GO8_paquage_branch/src/OCE/SBC

Timestamp:

2022-01-19T19:34:39+01:00 (2 years ago)

Author:

jpalmier

Message:

Merge with first branch : NEMO_4.0.4_GO8_package

Location:

NEMO/branches/UKMO/NEMO_4.0.4_GO8_paquage_branch/src/OCE/SBC

Files:

• sbcisf.F90 (modified) (1 diff)
• sbcrnf.F90 (modified) (2 diffs)
• sbcssm.F90 (modified) (2 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_GO8_paquage_branch/src/OCE/SBC/sbcisf.F90

@@ -355 +355 @@
                 ik = 2
 !!gm potential bug: use gdepw_0 not _n
-                DO WHILE ( ik <= mbkt(ji,jj) .AND. gdepw_n(ji,jj,ik) < rzisf_tbl(ji,jj) ) ;  ik = ik + 1 ;  END DO
+!!DS following Gurvan's suggestion here because it fixes a restartability issue.
+                DO WHILE ( ik <= mbkt(ji,jj) .AND. gdepw_0(ji,jj,ik) < rzisf_tbl(ji,jj) ) ;  ik = ik + 1 ;  END DO
                 misfkt(ji,jj) = ik-1
             END DO

NEMO/branches/UKMO/NEMO_4.0.4_GO8_paquage_branch/src/OCE/SBC/sbcrnf.F90

@@ -18 +18 @@
    USE dom_oce        ! ocean space and time domain
    USE phycst         ! physical constants
+   USE sbcisf         ! surface boundary condition: ice-shelf
    USE sbc_oce        ! surface boundary condition variables
    USE eosbn2         ! Equation Of State
@@ -140 +141 @@
                rnf_tsc(:,:,jp_tem) = sst_m(:,:) * rnf(:,:) * r1_rau0
             END WHERE
+            WHERE( sf_t_rnf(1)%fnow(:,:,1) == -222._wp )
+            ! where fwf comes from melting of ice shelves or iceberg
+            rnf_tsc(:,:,jp_tem) = ztfrz(:,:) * rnf(:,:) * r1_rau0 - rnf(:,:) * rLfusisf * r1_rau0_rcp
+            END WHERE
          ELSE                                                        ! use SST as runoffs temperature
             !CEOD River is fresh water so must at least be 0 unless we consider ice

NEMO/branches/UKMO/NEMO_4.0.4_GO8_paquage_branch/src/OCE/SBC/sbcssm.F90

@@ -57 +57 @@
       REAL(wp) ::   zcoef, zf_sbc       ! local scalar
       REAL(wp), DIMENSION(jpi,jpj,jpts) :: zts
+      CHARACTER(len=4),SAVE :: stype
       !!---------------------------------------------------------------------
+      IF( kt == nit000 ) THEN
+         IF( ln_TEOS10 ) THEN
+            stype='abs'   ! teos-10: using absolute salinity (sst is converted to potential temperature for the surface module)
+         ELSE IF( ln_EOS80  ) THEN
+            stype='pra'   ! eos-80: using practical salinity
+         ELSE IF ( ln_SEOS) THEN
+            stype='seos' ! seos using Simplified Equation of state (sst is converted to potential temperature for the surface module)
+         ENDIF
+      ENDIF
       !
       !                                        !* surface T-, U-, V- ocean level variables (T, S, depth, velocity)
@@ -174 +184 @@
          CALL iom_put( 'ssu_m', ssu_m )
          CALL iom_put( 'ssv_m', ssv_m )
-         CALL iom_put( 'sst_m', sst_m )
-         CALL iom_put( 'sss_m', sss_m )
+         CALL iom_put( 'sst_m_pot', sst_m )
+         CALL iom_put( 'sss_m_'//stype, sss_m )
          CALL iom_put( 'ssh_m', ssh_m )
          CALL iom_put( 'e3t_m', e3t_m )