Changeset 3294 for trunk/NEMOGCM/NEMO/LIM_SRC_3/limupdate.F90

Timestamp:

2012-01-28T17:44:18+01:00 (12 years ago)

Author:

rblod

Message:

Merge of 3.4beta into the trunk

File:

• trunk/NEMOGCM/NEMO/LIM_SRC_3/limupdate.F90 (modified) (9 diffs)

trunk/NEMOGCM/NEMO/LIM_SRC_3/limupdate.F90

@@ -35 +35 @@
    USE prtctl           ! Print control
    USE lbclnk           ! lateral boundary condition - MPP exchanges
+   USE wrk_nemo         ! work arrays
 
    IMPLICIT NONE
@@ -85 +86 @@
       REAL(wp) ::   z_prescr_hi, zat_i_old, ztmelts, ze_s
 
-      LOGICAL , DIMENSION(jpi,jpj,jpl) ::  internal_melt
-      REAL(wp), DIMENSION(jkmax) ::   zthick0, zqm0      ! thickness of the layers and heat contents for
+      INTEGER , POINTER, DIMENSION(:,:,:) ::  internal_melt
+      REAL(wp), POINTER, DIMENSION(:) ::   zthick0, zqm0      ! thickness of the layers and heat contents for
       !!-------------------------------------------------------------------
+
+      CALL wrk_alloc( jpi,jpj,jpl, internal_melt )   ! integer
+      CALL wrk_alloc( jkmax, zthick0, zqm0 )
 
       IF( ln_nicep ) THEN  
@@ -456 +460 @@
       ! 2.3) Melt of an internal layer
       !---------------------------------
-      internal_melt(:,:,:) = .false.
+      internal_melt(:,:,:) = 0
 
       DO jl = 1, jpl
@@ -471 +475 @@
                      !                    WRITE(numout,*) ' e_i : ', e_i(ji,jj,jk,jl)
                      !                    WRITE(numout,*) ' v_i : ', v_i(ji,jj,jl)
-                     internal_melt(ji,jj,jl) = .true.
+                     internal_melt(ji,jj,jl) = 1
                   ENDIF
                END DO ! ji
@@ -481 +485 @@
          DO jj = 1, jpj 
             DO ji = 1, jpi
-               IF( internal_melt(ji,jj,jl) ) THEN
+               IF( internal_melt(ji,jj,jl) == 1 ) THEN
                   ! initial ice thickness
                   !-----------------------
@@ -576 +580 @@
       ENDIF
 
-      internal_melt(:,:,:) = .false.
+      internal_melt(:,:,:) = 0
 
       ! Melt of snow
@@ -589 +593 @@
                ! If snow energy of melting smaller then Lf
                ! Then all snow melts and meltwater, heat go to the ocean
-               IF ( ze_s .LE. rhosn * lfus ) internal_melt(ji,jj,jl) = .true.
+               IF ( ze_s .LE. rhosn * lfus ) internal_melt(ji,jj,jl) = 1
 
                IF( ln_nicep ) THEN  
@@ -611 +615 @@
          DO jj = 1, jpj 
             DO ji = 1, jpi
-               IF ( internal_melt(ji,jj,jl) ) THEN
+               IF ( internal_melt(ji,jj,jl) == 1 ) THEN
                   v_s(ji,jj,jl)   = 0.0
                   e_s(ji,jj,1,jl) = 0.0
@@ -1027 +1031 @@
       ENDIF
 
-      !---------------------
+      CALL wrk_dealloc( jpi,jpj,jpl, internal_melt )   ! integer
+      CALL wrk_dealloc( jkmax, zthick0, zqm0 )
 
    END SUBROUTINE lim_update