Changeset 7412 for branches/2016/dev_merge_2016/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90

Timestamp:

2016-12-01T11:30:29+01:00 (8 years ago)

Author:

lovato

Message:

Merge dev_NOC_CMCC_merge_2016 into branch

File:

• branches/2016/dev_merge_2016/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90 (modified) (4 diffs)

branches/2016/dev_merge_2016/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90

@@ -59 +59 @@
    USE lbcnfd, ONLY: isendto, nsndto, nfsloop, nfeloop ! Setup of north fold exchanges
    USE icbstp          ! handle bergs, calving, themodynamics and transport
-#if defined key_bdy
    USE bdyini          ! open boundary cond. setting       (bdy_init routine). clem: mandatory for LIM3
-   USE bdydta          ! open boundary cond. setting   (bdy_dta_init routine). clem: mandatory for LIM3
-#endif
-   USE bdy_par
 
    IMPLICIT NONE
@@ -363 +359 @@
       !           the environment of ocean BDY. Therefore bdy is called in both OPA and SAS modules. 
       !           This is not clean and should be changed in the future. 
-      IF( lk_bdy        )   CALL     bdy_init
-      IF( lk_bdy        )   CALL bdy_dta_init
+                            CALL     bdy_init
       ! ==>
       
@@ -514 +509 @@
       USE diawri    , ONLY: dia_wri_alloc
       USE dom_oce   , ONLY: dom_oce_alloc
-#if defined key_bdy   
-      USE bdy_oce   , ONLY: bdy_oce_alloc
+      USE bdy_oce   , ONLY: ln_bdy, bdy_oce_alloc
       USE oce         ! clem: mandatory for LIM3 because needed for bdy arrays
-#else
-      USE oce       , ONLY : sshn, sshb, snwice_mass, snwice_mass_b, snwice_fmass
-#endif
       !
       INTEGER :: ierr,ierr1,ierr2,ierr3,ierr4,ierr5,ierr6,ierr7,ierr8
@@ -527 +518 @@
       ierr =        dia_wri_alloc   ()
       ierr = ierr + dom_oce_alloc   ()          ! ocean domain
-#if defined key_bdy
       ierr = ierr + bdy_oce_alloc   ()          ! bdy masks (incl. initialization)
-      ierr = ierr + oce_alloc       ()          ! (tsn...)
-#endif
-
-#if ! defined key_bdy
-       ALLOCATE( snwice_mass(jpi,jpj)  , snwice_mass_b(jpi,jpj),             &
-         &      snwice_fmass(jpi,jpj)  , STAT= ierr1 )
-      !
-      ! lim code currently uses surface temperature and salinity in tsn array for initialisation
-      ! and ub, vb arrays in ice dynamics, so allocate enough of arrays to use
-      ! clem: should not be needed. To be checked out
-      jpm = MAX(jp_tem, jp_sal)
-      ALLOCATE( tsn(jpi,jpj,1,jpm)  , STAT=ierr2 )
-      ALLOCATE( ub(jpi,jpj,1)       , STAT=ierr3 )
-      ALLOCATE( vb(jpi,jpj,1)       , STAT=ierr4 )
-      ALLOCATE( tsb(jpi,jpj,1,jpm)  , STAT=ierr5 )
-      ALLOCATE( sshn(jpi,jpj)       , STAT=ierr6 )
-      ALLOCATE( un(jpi,jpj,1)       , STAT=ierr7 )
-      ALLOCATE( vn(jpi,jpj,1)       , STAT=ierr8 )
-      ierr = ierr + ierr1 + ierr2 + ierr3 + ierr4 + ierr5 + ierr6 + ierr7 + ierr8
+# if ! defined key_lim2 && ! defined key_lim3
+         ierr = ierr + oce_alloc       ()          ! (tsn...)
+# else
+         ALLOCATE( snwice_mass(jpi,jpj)  , snwice_mass_b(jpi,jpj),             &
+            &      snwice_fmass(jpi,jpj)  , STAT= ierr1 )
+         !
+         ! lim code currently uses surface temperature and salinity in tsn array for initialisation
+         ! and ub, vb arrays in ice dynamics, so allocate enough of arrays to use
+         ! clem: should not be needed. To be checked out
+         jpm = MAX(jp_tem, jp_sal)
+         ALLOCATE( tsn(jpi,jpj,1,jpm)  , STAT=ierr2 )
+         ALLOCATE( ub(jpi,jpj,1)       , STAT=ierr3 )
+         ALLOCATE( vb(jpi,jpj,1)       , STAT=ierr4 )
+         ALLOCATE( tsb(jpi,jpj,1,jpm)  , STAT=ierr5 )
+         ALLOCATE( sshn(jpi,jpj)       , STAT=ierr6 )
+         ALLOCATE( un(jpi,jpj,1)       , STAT=ierr7 )
+         ALLOCATE( vn(jpi,jpj,1)       , STAT=ierr8 )
+         ierr = ierr + ierr1 + ierr2 + ierr3 + ierr4 + ierr5 + ierr6 + ierr7 + ierr8
 #endif
       !