Changeset 4957 for branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/ICB/icb_oce.F90

Timestamp:

2014-12-02T15:21:47+01:00 (10 years ago)

Author:

acc

Message:

Branch dev_MERGE_2014. Style changes and implementation of ICB bugfix #1389.

File:

• branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/ICB/icb_oce.F90 (modified) (3 diffs)

branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/ICB/icb_oce.F90

@@ -44 +44 @@
 
 INTEGER, PUBLIC, PARAMETER ::   nclasses = 10   !: Number of icebergs classes   
-!!INTEGER, PUBLIC &
-!!#if !defined key_agrif 
-!!           , PARAMETER &
-!!#endif
-!!     :: &
-!!     nclasses = 10   !: Number of icebergs classes
    INTEGER, PUBLIC, PARAMETER ::   nkounts  =  3   !: Number of integers combined for unique naming
 
@@ -93 +87 @@
    ! particularly for MPP when iceberg can lie inside T grid but outside U, V, or f grid
    REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   uo_e, vo_e
-   REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   ff_e
+   REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   ff_e, tt_e, fr_e, hicth
    REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   ua_e, va_e
    REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   ssh_e
@@ -180 +174 @@
          &      vi_e(0:jpi+1,0:jpj+1) ,                            &
 #endif
-         &      ff_e(0:jpi+1,0:jpj+1) , ssh_e(0:jpi+1,0:jpj+1) ,   &
+         &      ff_e(0:jpi+1,0:jpj+1) , fr_e(0:jpi+1,0:jpj+1)  ,   &
+         &      tt_e(0:jpi+1,0:jpj+1) , ssh_e(0:jpi+1,0:jpj+1) ,   &
+         &      hicth(0:jpi+1,0:jpj+1),                            &
          &      first_width(nclasses) , first_length(nclasses) ,   &
          &      src_calving (jpi,jpj) ,                            &