Changeset 5541 for trunk/NEMOGCM/NEMO/OPA_SRC/SBC

Timestamp:

2015-07-02T17:24:34+02:00 (9 years ago)

Author:

jchanut

Message:

change eos_fzp function into a subroutine (needed for AGRIF), #1530

Location:

trunk/NEMOGCM/NEMO/OPA_SRC/SBC

Files:

• sbcice_if.F90 (modified) (1 diff)
• sbcice_lim.F90 (modified) (1 diff)
• sbcice_lim_2.F90 (modified) (1 diff)
• sbcisf.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90

@@ -103 +103 @@
                                  ! ( d rho / dt ) / ( d rho / ds )      ( s = 34, t = -1.8 )
          
-         fr_i(:,:) = eos_fzp( sss_m ) * tmask(:,:,1)      ! sea surface freezing temperature [Celcius]
+         CALL eos_fzp( sss_m(:,:), fr_i(:,:) )       ! sea surface freezing temperature [Celcius]
+         fr_i(:,:) = fr_i(:,:) * tmask(:,:,1)
 
          IF( ln_cpl )   a_i(:,:,1) = fr_i(:,:)         

trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90

@@ -126 +126 @@
          
          ! masked sea surface freezing temperature [Kelvin] (set to rt0 over land)
-         t_bo(:,:) = ( eos_fzp( sss_m ) + rt0 ) * tmask(:,:,1) + rt0 * ( 1._wp - tmask(:,:,1) )  
-         
+         CALL eos_fzp( sss_m(:,:) , t_bo(:,:) )
+         t_bo(:,:) = ( t_bo(:,:) + rt0 ) * tmask(:,:,1) + rt0 * ( 1._wp - tmask(:,:,1) )
+          
          ! Mask sea ice surface temperature (set to rt0 over land)
          DO jl = 1, jpl

trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90

@@ -150 +150 @@
 
          ! ... masked sea surface freezing temperature [Kelvin] (set to rt0 over land)
-         tfu(:,:) = eos_fzp( sss_m ) +  rt0 
+         CALL eos_fzp( sss_m(:,:), tfu(:,:) )
+         tfu(:,:) = tfu(:,:) + rt0
 
          zsist (:,:,1) = sist (:,:) + rt0 * ( 1. - tmask(:,:,1) )

trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90

@@ -370 +370 @@
              ! Calculate freezing temperature
                 zpress = grav*rau0*fsdept(ji,jj,ik)*1.e-04 
-                zt_frz = eos_fzp(tsb(ji,jj,ik,jp_sal), zpress) 
+                CALL eos_fzp(tsb(ji,jj,ik,jp_sal), zt_frz, zpress) 
                 zt_sum = zt_sum + (tsn(ji,jj,ik,jp_tem)-zt_frz) * fse3t(ji,jj,ik) * tmask(ji,jj,ik)  ! sum temp
              ENDDO
@@ -452 +452 @@
       zti(:,:)=tinsitu( ttbl, stbl, zpress )
 ! Calculate freezing temperature
-      zfrz(:,:)=eos_fzp( sss_m(:,:), zpress )
+      CALL eos_fzp( sss_m(:,:), zfrz(:,:), zpress )