Changeset 4306 for branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/LIM_SRC_2/thd_ice_2.F90

Timestamp:

2013-11-21T15:59:57+01:00 (10 years ago)

Author:

cetlod

Message:

dev_MERGE_2013 : merge in the solar mean flux branch from MERCATOR, see ticket #1187

File:

• branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/LIM_SRC_2/thd_ice_2.F90 (modified) (4 diffs)

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/LIM_SRC_2/thd_ice_2.F90

@@ -13 +13 @@
    !!----------------------------------------------------------------------
    USE par_ice_2
+   USE ice_2
 
    IMPLICIT NONE
@@ -54 +55 @@
       fstbif_1d   ,     &  !:    "                  "      fstric
       fltbif_1d   ,     &  !:    "                  "      ffltbif
+      fstbif_daymean_1d, & !:    "                  " fstric_daymean
       fscbq_1d    ,     &  !:    "                  "      fscmcbq
       qsr_ice_1d  ,     &  !:    "                  "      qsr_ice
+      qsr_ice_mean_1d , &  !:    "                  "      qsr_ice_mean
       fr1_i0_1d   ,     &  !:    "                  "      fr1_i0
       fr2_i0_1d   ,     &  !:    "                  "      fr2_i0
@@ -96 +99 @@
       !!----------------------------------------------------------------------
       USE lib_mpp        ! MPP library
-      INTEGER :: ierr(4)
+      INTEGER :: ierr(5)
       !!----------------------------------------------------------------------
       !
@@ -119 +122 @@
          &      tbif_1d(jpij, jplayersp1), Stat=ierr(4))
          !
+      IF( ltrcdm2dc_ice )ALLOCATE(fstbif_daymean_1d(jpij),qsr_ice_mean_1d(jpij),Stat=ierr(5))
+         !
       thd_ice_alloc_2 = MAXVAL(ierr)
       IF( thd_ice_alloc_2 /= 0 )   CALL ctl_warn('thd_ice_alloc_2: failed to allocate arrays')