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 3263 for branches – NEMO

Changeset 3263 for branches


Ignore:
Timestamp:
2012-01-17T15:10:34+01:00 (12 years ago)
Author:
rblod
Message:

Correct cpp name for key_ice_lim see ticket #909

Location:
branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90

    r3191 r3263  
    329329                               ,nn_dyn3d_dta(ib_bdy)       & 
    330330                               ,nn_tra_dta(ib_bdy)         & 
    331 #if defined key_ice_lim2 
     331#if defined key_lim2 
    332332                               ,nn_ice_lim2_dta(ib_bdy)    & 
    333333#endif 
  • branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90

    r3203 r3263  
    3838  USE dianam          ! build name of file 
    3939  USE lib_mpp         ! distributed memory computing library 
    40 #if defined key_ice_lim2 || defined key_ice_lim3 
     40#if defined key_lim2 || defined key_lim3 
    4141  USE ice 
    4242#endif 
     
    794794           ENDDO !end of loop on the density classes 
    795795 
    796 #if defined key_ice_lim 
     796#if defined key_lim2 || defined key_lim3 
    797797 
    798798           !ICE CASE     
  • branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

    r3186 r3263  
    10151015         & un, vn,  & 
    10161016         & sshn 
    1017 #if defined key_ice_lim 
     1017#if defined key_lim2 || defined key_lim3 
    10181018      USE ice, ONLY : &                     ! LIM Ice model variables 
    10191019         & frld 
     
    10311031      INTEGER :: jveloset               ! velocity profile data loop variable 
    10321032      INTEGER :: jvar                   ! Variable number     
    1033 #if ! defined key_ice_lim 
     1033#if ! defined key_lim2 && ! defined key_lim3 
    10341034      REAL(wp), POINTER, DIMENSION(:,:) :: frld    
    10351035#endif 
    10361036      CHARACTER(LEN=20) :: datestr=" ",timestr=" " 
    10371037  
    1038 #if ! defined key_ice_lim 
     1038#if ! defined key_lim2 && ! defined key_lim3 
    10391039      CALL wrk_alloc(jpi,jpj,frld)  
    10401040#endif 
     
    10511051      ! No LIM => frld == 0.0_wp 
    10521052      !----------------------------------------------------------------------- 
    1053 #if ! defined key_ice_lim 
     1053#if ! defined key_lim2 && ! defined key_lim3 
    10541054      frld(:,:) = 0.0_wp 
    10551055#endif 
     
    10991099      ENDIF 
    11001100 
    1101 #if defined key_ice_lim 
     1101#if defined key_lim2 || defined key_lim3 
    11021102      IF ( ln_seaice ) THEN 
    11031103         DO jseaiceset = 1, nseaicesets 
     
    11191119      ENDIF 
    11201120 
    1121 #if ! defined key_ice_lim 
     1121#if ! defined key_lim2 && ! defined key_lim3 
    11221122      CALL wrk_dealloc(jpi,jpj,frld)  
    11231123#endif 
Note: See TracChangeset for help on using the changeset viewer.