Changeset 5779 for branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90

Timestamp:

2015-10-06T18:28:13+02:00 (9 years ago)

Author:

mathiot

Message:

ISF coupling branch: correct some compilation issues, remove code related to MISOMIP/ISOMIP+ and polishing

File:

• branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90 (modified) (4 diffs)

branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90

@@ -63 +63 @@
 
    REAL(wp), PUBLIC, SAVE ::   rcpi   = 2000.0_wp     ! phycst ?
-   REAL(wp), PUBLIC, SAVE ::   kappa  =    0.0_wp    ! phycst ?
+   REAL(wp), PUBLIC, SAVE ::   kappa  = 1.54e-6_wp    ! phycst ?
    REAL(wp), PUBLIC, SAVE ::   rhoisf = 920.0_wp      ! phycst ?
    REAL(wp), PUBLIC, SAVE ::   tsurf  = -20.0_wp      ! phycst ?
@@ -152 +152 @@
             !: read effective lenght (BG03)
             IF (nn_isf == 2) THEN
-               cvarLeff = 'soLeff' 
+               ! Read Data and save some integral values
                CALL iom_open( sn_Leff_isf%clname, inum )
+               cvarLeff  = 'soLeff'               !: variable name for Efficient Length scale
                CALL iom_get( inum, jpdom_data, cvarLeff, risfLeff , 1)
                CALL iom_close(inum)
@@ -297 +298 @@
          ! 
          ! output
-         IF( iom_use('qisf'  ) )   CALL iom_put('qisf'  , qisf)
-         IF( iom_use('fwfisf') )   CALL iom_put('fwfisf', fwfisf)
+         CALL iom_put('qisf'  , qisf)
+         IF( iom_use('fwfisf') )   CALL iom_put('fwfisf', fwfisf * stbl(:,:) / soce )
       END IF
   
@@ -528 +529 @@
 ! zwflx is upward water flux
 ! If non conservative we have zcfac=0.0 so what follows is then zfwflx*sss_m/zsfrz
-!!!!!!!!                     zfwflx = ( zgammas*rau0 - zcfac*zfwflx ) * (zsfrz - stbl(ji,jj)) / stbl(ji,jj)
+                     zfwflx = ( zgammas*rau0 - zcfac*zfwflx ) * (zsfrz - stbl(ji,jj)) / stbl(ji,jj)
 ! test convergence and compute gammat
                      IF (( zhtflx - zhtflx_b) .LE. 0.01 ) lit = .FALSE.