Changeset 9570 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/ICB
- Timestamp:
- 2018-05-11T12:53:25+02:00 (6 years ago)
- Location:
- branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC
- Files:
-
- 11 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/ICB/icb_oce.F90
r9190 r9570 89 89 REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE :: ua_e, va_e 90 90 REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE :: ssh_e 91 #if defined key_ lim3 || defined key_cice91 #if defined key_si3 || defined key_cice 92 92 REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE :: ui_e, vi_e 93 93 #endif … … 144 144 145 145 !!---------------------------------------------------------------------- 146 !! NEMO/O PA3.3 , NEMO Consortium (2011)146 !! NEMO/OCE 3.3 , NEMO Consortium (2011) 147 147 !! $Id$ 148 148 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) … … 169 169 ALLOCATE( uo_e(0:jpi+1,0:jpj+1) , ua_e(0:jpi+1,0:jpj+1) , & 170 170 & vo_e(0:jpi+1,0:jpj+1) , va_e(0:jpi+1,0:jpj+1) , & 171 #if defined key_ lim3 || defined key_cice171 #if defined key_si3 || defined key_cice 172 172 & ui_e(0:jpi+1,0:jpj+1) , & 173 173 & vi_e(0:jpi+1,0:jpj+1) , & -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/ICB/icbclv.F90
r9190 r9570 32 32 33 33 !!---------------------------------------------------------------------- 34 !! NEMO/O PA3.3 , NEMO Consortium (2011)34 !! NEMO/OCE 3.3 , NEMO Consortium (2011) 35 35 !! $Id$ 36 36 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/ICB/icbdia.F90
r9190 r9570 88 88 89 89 !!---------------------------------------------------------------------- 90 !! NEMO/O PA3.3 , NEMO Consortium (2011)90 !! NEMO/OCE 3.3 , NEMO Consortium (2011) 91 91 !! $Id$ 92 92 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/ICB/icbdyn.F90
r9190 r9570 25 25 26 26 !!---------------------------------------------------------------------- 27 !! NEMO/O PA3.3 , NEMO Consortium (2011)27 !! NEMO/OCE 3.3 , NEMO Consortium (2011) 28 28 !! $Id$ 29 29 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/ICB/icbini.F90
r9190 r9570 40 40 !: used in icbini and icbstp 41 41 !!---------------------------------------------------------------------- 42 !! NEMO/O PA3.3 , NEMO Consortium (2011)42 !! NEMO/OCE 3.3 , NEMO Consortium (2011) 43 43 !! $Id$ 44 44 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/ICB/icblbc.F90
r9190 r9570 64 64 65 65 !!---------------------------------------------------------------------- 66 !! NEMO/O PA3.3 , NEMO Consortium (2011)66 !! NEMO/OCE 3.3 , NEMO Consortium (2011) 67 67 !! $Id$ 68 68 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/ICB/icbrst.F90
r9190 r9570 44 44 45 45 !!---------------------------------------------------------------------- 46 !! NEMO/O PA3.3 , NEMO Consortium (2011)46 !! NEMO/OCE 3.3 , NEMO Consortium (2011) 47 47 !! $Id$ 48 48 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/ICB/icbstp.F90
r9328 r9570 46 46 47 47 !!---------------------------------------------------------------------- 48 !! NEMO/O PA3.3 , NEMO Consortium (2011)48 !! NEMO/OCE 3.3 , NEMO Consortium (2011) 49 49 !! $Id$ 50 50 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/ICB/icbthm.F90
r9190 r9570 31 31 32 32 !!---------------------------------------------------------------------- 33 !! NEMO/O PA3.3 , NEMO Consortium (2011)33 !! NEMO/OCE 3.3 , NEMO Consortium (2011) 34 34 !! $Id$ 35 35 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/ICB/icbtrj.F90
r9226 r9570 47 47 48 48 !!---------------------------------------------------------------------- 49 !! NEMO/O PA4.0 , NEMO Consortium (2017)49 !! NEMO/OCE 4.0 , NEMO Consortium (2017) 50 50 !! $Id$ 51 51 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/ICB/icbutl.F90
r9190 r9570 22 22 USE icb_oce ! define iceberg arrays 23 23 USE sbc_oce ! ocean surface boundary conditions 24 #if defined key_ lim324 #if defined key_si3 25 25 USE ice, ONLY: u_ice, v_ice, hm_i ! LIM-3 variables 26 26 #endif … … 46 46 47 47 !!---------------------------------------------------------------------- 48 !! NEMO/O PA3.3 , NEMO Consortium (2011)48 !! NEMO/OCE 3.3 , NEMO Consortium (2011) 49 49 !! $Id$ 50 50 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) … … 80 80 CALL lbc_lnk_icb( fr_e, 'T', +1._wp, 1, 1 ) 81 81 CALL lbc_lnk_icb( tt_e, 'T', +1._wp, 1, 1 ) 82 #if defined key_ lim382 #if defined key_si3 83 83 hicth(:,:) = 0._wp ; hicth(1:jpi,1:jpj) = hm_i (:,:) 84 84 ui_e(:,:) = 0._wp ; ui_e(1:jpi, 1:jpj) = u_ice(:,:) … … 149 149 pva = pva * zmod 150 150 151 #if defined key_ lim3151 #if defined key_si3 152 152 pui = icb_utl_bilin_h( ui_e , pi, pj, 'U' ) ! sea-ice velocities 153 153 pvi = icb_utl_bilin_h( vi_e , pi, pj, 'V' )
Note: See TracChangeset
for help on using the changeset viewer.