Changeset 4240

Timestamp:

2013-11-18T17:59:48+01:00 (11 years ago)

Author:

cbricaud

Message:

correct an error and remove key vectop_loop in AMM cpp file

Location:

branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM

Files:

• CONFIG/AMM12/cpp_AMM12.fcm (modified) (1 diff)
• NEMO/OPA_SRC/DOM/domzgr.F90 (modified) (2 diffs)

branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/AMM12/cpp_AMM12.fcm

@@ -1 @@
- bld::tool::fppkeys  key_bdy key_tide key_vectopt_loop key_amm_12km  key_dynspg_ts key_ldfslp  key_zdfgls  key_vvl key_diainstant key_mpp_mpi key_iomput
+ bld::tool::fppkeys  key_bdy key_tide key_amm_12km  key_dynspg_ts key_ldfslp  key_zdfgls  key_vvl key_diainstant key_mpp_mpi key_iomput

branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -1127 +1127 @@
       IF( nn_timing == 1 )  CALL timing_start('zgr_sco')
       !
-      CALL wrk_alloc( jpi, jpj,      zenv, ztmp, zmsk, zri, zrj, zhbat                           )
+      CALL wrk_alloc( jpi, jpj, zenv, ztmp, zmsk, zri, zrj, zhbat , ztmpi1, ztmpi2, ztmpj1, ztmpj2 )
       !
       REWIND( numnam )                       ! Read Namelist namzgr_sco : sigma-stretching parameters
@@ -1542 +1542 @@
       END DO
       !
-      CALL wrk_dealloc( jpi, jpj,      zenv, ztmpi1, ztmpi2, ztmpj1, ztmpj2, zri, zrj, zhbat                           )      !
+      CALL wrk_dealloc( jpi, jpj, zenv, ztmp, zmsk, zri, zrj, zhbat , ztmpi1, ztmpi2, ztmpj1, ztmpj2 )
       !
       IF( nn_timing == 1 )  CALL timing_stop('zgr_sco')