New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 4325 for branches – NEMO

Changeset 4325 for branches


Ignore:
Timestamp:
2013-11-29T16:27:48+01:00 (10 years ago)
Author:
cbricaud
Message:

dev_MERGE_2013: solve tickets 1192, 1193, 1194

Location:
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90

    r4319 r4325  
    2828   USE limrst_2       ! LIM2 restart 
    2929   USE limsbc_2       ! LIM2 surface boundary condition 
     30   USE limdia_2 
    3031   USE in_out_manager ! I/O manager 
    3132   USE lib_mpp        ! MPP library 
     
    9596      ENDIF 
    9697      ! 
     98      CALL lim_dia_init_2 
     99      ! 
    97100      tn_ice(:,:,1) = sist(:,:)        ! ice temperature  known by the ocean 
    98101      fr_i  (:,:)   = 1.0 - frld(:,:)  ! sea-ice fraction known by the ocean 
  • branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/LIM_SRC_2/limdia_2.F90

    r4147 r4325  
    2929   PRIVATE 
    3030 
    31    PUBLIC               lim_dia_2     ! called by sbc_ice_lim_2 
     31   PUBLIC               lim_dia_2          ! called by sbc_ice_lim_2 
     32   PUBLIC               lim_dia_init_2     ! called by sbc_ice_lim_2 
    3233 
    3334   INTEGER, PUBLIC ::   ntmoy  ,   &  !: instantaneous values of ice evolution or averaging ntmoy 
     
    8283      REAL(wp), DIMENSION(jpinfmx) ::   vinfor  ! temporary working space  
    8384      !!------------------------------------------------------------------- 
    84  
    85       IF( kt == nit000 )   CALL lim_dia_init_2  ! initialisation of ice_evolu file       
    8685 
    8786      ! computation of key variables at each time step    
  • branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_c2d.h90

    r4147 r4325  
    146146      INTEGER  ::   inum, iim, ijm            ! local integers 
    147147      INTEGER  ::   ifreq, il1, il2, ij, ii 
     148      INTEGER  ::   ijpt0,ijpt1 
    148149      REAL(wp) ::   zahmeq, zcoft, zcoff, zmsk 
    149150      CHARACTER (len=15) ::   clexp 
     
    373374      INTEGER ::   iim, ijm 
    374375      INTEGER ::   ifreq, il1, il2, ij, ii 
     376      INTEGER ::   ijpt0,ijpt1 
    375377      REAL(wp) ::   zahmeq, zcoft, zcoff, zmsk, zam20s 
    376378      CHARACTER (len=15) ::   clexp 
  • branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90

    r4310 r4325  
    117117         END DO 
    118118      END DO 
    119       ikmax = MAX( MAXVAL( inml_mle(:,:) ), jpkm1 )                  ! max level of the computation 
     119      ikmax = MIN( MAXVAL( inml_mle(:,:) ), jpkm1 )                  ! max level of the computation 
    120120      ! 
    121121      ! 
Note: See TracChangeset for help on using the changeset viewer.