Changeset 10700

Timestamp:

2019-02-19T17:37:56+01:00 (6 years ago)

Author:

mathiot

Message:

allocate/define/initialise hi_e only if key_si3 is define (ticket #2238)

Location:

NEMO/branches/2019/fix_ticket2238_solution1/src/OCE/ICB

Files:

• icb_oce.F90 (modified) (2 diffs)
• icbini.F90 (modified) (1 diff)

NEMO/branches/2019/fix_ticket2238_solution1/src/OCE/ICB/icb_oce.F90

@@ -86 +86 @@
    ! 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, tt_e, fr_e, hi_e
+   REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   ff_e, tt_e, fr_e
    REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   ua_e, va_e
    REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   ssh_e
 #if defined key_si3 || defined key_cice
-   REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   ui_e, vi_e
+   REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   hi_e, ui_e, vi_e
 #endif
 
@@ -174 +174 @@
          &      ui_e(0:jpi+1,0:jpj+1) ,                            &
          &      vi_e(0:jpi+1,0:jpj+1) ,                            &
+         &      hi_e(0:jpi+1,0:jpj+1) ,                            &
 #endif
          &      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) ,   &
-         &      hi_e(0:jpi+1,0:jpj+1) ,                            &
          &      first_width(nclasses) , first_length(nclasses) ,   &
          &      src_calving (jpi,jpj) ,                            &

NEMO/branches/2019/fix_ticket2238_solution1/src/OCE/ICB/icbini.F90

@@ -79 +79 @@
       ua_e(:,:) = 0._wp   ;   va_e(:,:) = 0._wp   ;
       ff_e(:,:) = 0._wp   ;   tt_e(:,:) = 0._wp   ;
-      fr_e(:,:) = 0._wp   ;   hi_e(:,:) = 0._wp   ;
+      fr_e(:,:) = 0._wp   ;
 #if defined key_si3
+      hi_e(:,:) = 0._wp   ;
       ui_e(:,:) = 0._wp   ;   vi_e(:,:) = 0._wp   ;
 #endif