Changeset 3785 for branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90

Timestamp:

2013-02-10T08:53:27+01:00 (11 years ago)

Author:

gm

Message:

dev_MERGE_2012: #1051 : bug correction to compile LIM3 with ASM and with ICB

File:

• branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90 (modified) (6 diffs)

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90

@@ -1 +1 @@
 MODULE icbini
-
    !!======================================================================
    !!                       ***  MODULE  icbini  ***
@@ -19 +18 @@
    USE in_out_manager ! IO routines and numout in particular
    USE lib_mpp        ! mpi library and lk_mpp in particular
-   USE sbc_oce        ! ocean: surface boundary condition
+   USE sbc_oce        ! ocean  : surface boundary condition
+   USE sbc_ice        ! sea-ice: surface boundary condition
    USE iom            ! IOM library
    USE fldread        ! field read
@@ -267 +267 @@
    END SUBROUTINE icb_init
 
+
    SUBROUTINE icb_ini_gen()
       !!----------------------------------------------------------------------
@@ -333 +334 @@
    END SUBROUTINE icb_ini_gen
 
+
    SUBROUTINE icb_nam
       !!----------------------------------------------------------------------
@@ -377 +379 @@
       IF( zfact < 1._wp ) THEN
          IF( zfact <= 0._wp ) THEN
-            CALL ctl_stop( 'icb_nam: sum of berg distribution equal to zero' )
+            
          ELSE
             rn_distribution(:) = rn_distribution(:) / zfact
             CALL ctl_warn( 'icb_nam: sum of berg input distribution not equal to one and so RESCALED' )
          ENDIF
+      ENDIF
+
+      IF( lk_lim3 .AND. ln_icebergs ) THEN
+         CALL ctl_stop( 'icb_nam: the use of ICB with LIM3 not allowed. ice thickness missing in ICB' )
       ENDIF
 
@@ -430 +436 @@
 
    !!======================================================================
-
 END MODULE icbini