Changeset 4205 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90

Timestamp:

2013-11-14T18:02:06+01:00 (10 years ago)

Author:

clem

Message:

 

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90 (modified) (10 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90

@@ -153 +153 @@
       CALL wrk_alloc( jpi,jpj,jpl, zalb_ice_os, zalb_ice_cs )
 
-      IF ( ln_cpl .OR. ln_iceflx_ave .OR. ln_iceflx_linear ) THEN
-         CALL wrk_alloc( jpi,jpj,jpl, zalb_ice)
-      END IF
-      IF ( ln_iceflx_ave .OR. ln_iceflx_linear ) THEN
-         CALL wrk_alloc( jpi,jpj, ztem_ice_all, zalb_ice_all, z_qsr_ice_all, z_qns_ice_all, z_qla_ice_all, z_dqns_ice_all, z_dqla_ice_all)
-      ENDIF
-
+#if defined key_coupled
+      IF ( ln_cpl .OR. ln_iceflx_ave .OR. ln_iceflx_linear ) CALL wrk_alloc( jpi,jpj,jpl, zalb_ice)
+      IF ( ln_iceflx_ave .OR. ln_iceflx_linear ) &
+         &   CALL wrk_alloc( jpi,jpj, ztem_ice_all, zalb_ice_all, z_qsr_ice_all, z_qns_ice_all, z_qla_ice_all, z_dqns_ice_all, z_dqla_ice_all)
+#endif
 
       IF( kt == nit000 ) THEN
@@ -169 +167 @@
          !
          IF( ln_nicep ) THEN      ! control print at a given point
-            jiindx = 15   ;   jjindx = 46
+            jiindx = 6   ;   jjindx = 47
             WRITE(numout,*) ' The debugging point is : jiindx : ',jiindx, ' jjindx : ',jjindx
          ENDIF
@@ -193 +191 @@
          IF ( ln_cpl ) zalb_ice (:,:,:) = 0.5 * ( zalb_ice_cs (:,:,:) +  zalb_ice_os (:,:,:) )
          
+#if defined key_coupled
          IF ( ln_iceflx_ave .OR. ln_iceflx_linear ) THEN
             !
@@ -200 +199 @@
             !
          ENDIF
-                                                     ! Bulk formulea - provides the following fields:
+#endif
+                                               ! Bulk formulea - provides the following fields:
          ! utau_ice, vtau_ice : surface ice stress                     (U- & V-points)   [N/m2]
          ! qsr_ice , qns_ice  : solar & non solar heat flux over ice   (T-point)         [W/m2]
@@ -238 +238 @@
 
          ! Average over all categories
+#if defined key_coupled
          IF ( ln_iceflx_ave .OR. ln_iceflx_linear ) THEN
 
@@ -267 +268 @@
             END IF
          END IF
-
+#endif
          !                                           !----------------------!
          !                                           ! LIM-3  time-stepping !
@@ -283 +284 @@
          old_smv_i(:,:,:)   = smv_i(:,:,:)     ! salt content
          old_oa_i (:,:,:)   = oa_i (:,:,:)     ! areal age content
-
+         !
+         old_u_ice(:,:) = u_ice(:,:)
+         old_v_ice(:,:) = v_ice(:,:)
          !                                           ! intialisation to zero    !!gm is it truly necessary ???
          d_a_i_thd  (:,:,:)   = 0._wp   ;   d_a_i_trp  (:,:,:)   = 0._wp
@@ -292 +295 @@
          d_smv_i_thd(:,:,:)   = 0._wp   ;   d_smv_i_trp(:,:,:)   = 0._wp
          d_oa_i_thd (:,:,:)   = 0._wp   ;   d_oa_i_trp (:,:,:)   = 0._wp
+         !
+         d_u_ice_dyn(:,:) = 0._wp
+         d_v_ice_dyn(:,:) = 0._wp
          !
          sfx    (:,:) = 0._wp   ;   sfx_thd  (:,:) = 0._wp
@@ -373 +379 @@
                           CALL lim_wri( 1  )              ! Ice outputs 
 !clem # endif
-         IF( kt == nit000 )   CALL iom_close( numrir )  ! clem: close input ice restart file
+         IF( kt == nit000 .AND. ln_rstart )   &
+            &             CALL iom_close( numrir )        ! clem: close input ice restart file
+         !
          IF( lrst_ice )   CALL lim_rst_write( kt )        ! Ice restart file 
                           CALL lim_var_glo2eqv            ! ???
@@ -392 +400 @@
       !
       CALL wrk_dealloc( jpi,jpj,jpl, zalb_ice_os, zalb_ice_cs )
-      IF ( ln_cpl .OR. ln_iceflx_ave .OR. ln_iceflx_linear ) THEN
-         CALL wrk_dealloc( jpi,jpj,jpl, zalb_ice)
-      END IF
-      IF ( ln_iceflx_ave .OR. ln_iceflx_linear ) THEN
-         CALL wrk_dealloc( jpi,jpj, ztem_ice_all, zalb_ice_all, z_qsr_ice_all, z_qns_ice_all, z_qla_ice_all, z_dqns_ice_all, z_dqla_ice_all)
-      ENDIF
+
+#if defined key_coupled
+      IF ( ln_cpl .OR. ln_iceflx_ave .OR. ln_iceflx_linear ) CALL wrk_dealloc( jpi,jpj,jpl, zalb_ice)
+      IF ( ln_iceflx_ave .OR. ln_iceflx_linear ) &
+         &    CALL wrk_dealloc( jpi,jpj, ztem_ice_all, zalb_ice_all, z_qsr_ice_all, z_qns_ice_all, z_qla_ice_all, z_dqns_ice_all, z_dqla_ice_all)
+#endif
       !
       IF( nn_timing == 1 )  CALL timing_stop('sbc_ice_lim')