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

Changeset 828 for branches


Ignore:
Timestamp:
2008-03-06T17:16:27+01:00 (16 years ago)
Author:
rblod
Message:

Complete previous commit in correcting a few compilation bugs, see ticket #71

Location:
branches/dev_002_LIM/NEMO/OPA_SRC
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/dev_002_LIM/NEMO/OPA_SRC/DIA/diafwb.F90

    r824 r828  
    2020   USE blk_oce         ! ??? 
    2121   USE flxblk          ! atmospheric surface quantity 
    22    USE flxblk_2          ! atmospheric surface quantity 
    2322   USE lib_mpp         ! distributed memory computing library 
    2423 

  • branches/dev_002_LIM/NEMO/OPA_SRC/DOM/domain.F90

    r783 r828  
    257257      ENDIF 
    258258 
    259       IF( lk_ice_lim ) THEN 
     259      IF( lk_lim3 .OR. lk_lim2 ) THEN 
    260260         IF(lwp) WRITE(numout,*) '           ice model coupling frequency      nfice  = ', nfice 
    261261         IF( MOD( nitend - nit000 + 1, nfice) /= 0 ) THEN  

  • branches/dev_002_LIM/NEMO/OPA_SRC/SBC/albedo.F90

    r827 r828  
    3939#if defined key_lim3 
    4040      albice = 0.53  ,     &   !  albedo of melting ice in the arctic and antarctic (Shine & Hendersson-Sellers) 
    41 #elif defined key_lim2 
     41#else 
    4242      albice = 0.50  ,     &   !  albedo of melting ice in the arctic and antarctic (Shine & Hendersson-Sellers) 
    4343#endif 
    … …  
    8383      !! * Modules used 
    8484#if defined key_lim3 
     85      USE par_ice 
    8586      USE ice                   ! ??? 
    8687#elif defined key_lim2 

  • branches/dev_002_LIM/NEMO/OPA_SRC/SBC/flx_oce.F90

    r827 r828  
    3737#if defined key_lim3  
    3838   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpl)    ::   &  !: 
    39 #elif defined key_lim2  
     39#else 
    4040   REAL(wp), PUBLIC, DIMENSION(jpi,jpj)    ::   &  !: 
    4141#endif 
    … …  
    5555#if defined key_lim3  
    5656   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpl)    ::   &  !: 
    57 #elif defined key_lim2  
     57#else 
    5858   REAL(wp), PUBLIC, DIMENSION(jpi,jpj)    ::   &  !: 
    5959#endif 

  • branches/dev_002_LIM/NEMO/OPA_SRC/SBC/flxblk.F90

    r827 r828  
    2626   USE prtctl          ! Print control 
    2727#if defined key_lim3 
     28   USE par_ice 
    2829   USE ice 
    2930#elif defined key_lim2 
    … …  
    8384 
    8485CONTAINS 
    85 #if ! defined key_lim2 
     86#if defined key_lim3 
    8687 
    8788   SUBROUTINE flx_blk( psst ) 
    … …  
    220221      !!--------------------------------------------------------------------- 
    221222 
    222       !--------------------- 
    223       !   Initilization    ! 
    224       !--------------------- 
    225 #if ! defined key_lim3 
    226       tn_ice(:,:) = psst(:,:) 
    227 #endif 
    228  
    229223      !  Determine cloud optical depths as a function of latitude (Chou et al., 1981). 
    230224      !  and the correction factor for taking into account  the effect of clouds  
    … …  
    712706 
    713707 
    714 #elif defined key_lim2 
     708#else 
    715709 
    716710   SUBROUTINE flx_blk( psst ) 
    … …  
    846840      !!--------------------------------------------------------------------- 
    847841 
     842      !--------------------- 
     843      !   Initilization    ! 
     844      !--------------------- 
     845#if ! defined key_lim2 
     846      tn_ice(:,:) = psst(:,:) 
     847#endif 
     848 
    848849      !  Determine cloud optical depths as a function of latitude (Chou et al., 1981). 
    849850      !  and the correction factor for taking into account  the effect of clouds  

  • branches/dev_002_LIM/NEMO/OPA_SRC/SBC/flxfwb.F90

    r824 r828  
    2323   USE blk_oce 
    2424   USE flxblk          ! bulk formulea 
    25    USE flxblk_2          ! bulk formulea 
    2625   USE daymod          ! calendar 
    2726 

  • branches/dev_002_LIM/NEMO/OPA_SRC/phycst.F90

    r827 r828  
    4949      rt0_snow = 273.16_wp  ,  &  !: melting point of snow  (Kelvin) 
    5050      rt0_ice  = 273.16_wp  ,  &  !: melting point of ice   (Kelvin) 
    51 #elif defined key_lim2 
     51#else 
    5252      rt0_snow = 273.15_wp  ,  &  !: melting point of snow  (Kelvin) 
    5353      rt0_ice  = 273.05_wp  ,  &  !: melting point of ice   (Kelvin) 
    … …  
    6868      rhoic   = 917._wp       ,   &  !: density of sea ice (kg/m3) 
    6969      tmut    =   0.054       ,   &  !: decrease of seawater meltpoint with salinity 
    70 #elif defined key_lim2 
     70#else 
    7171      rcdsn   =   0.22_wp     ,   &  !: conductivity of the snow 
    7272      rcdic   =   2.034396_wp ,   &  !: conductivity of the ice 
    … …  
    189189         WRITE(numout,*) '          latent heat of fusion of fresh ice / snow = ', lfus    , ' J/kg' 
    190190         WRITE(numout,*) '          latent heat of subl.  of fresh ice / snow = ', lsub    , ' J/kg' 
    191 #elif defined key_lim2 
     191#else 
    192192         WRITE(numout,*) '          density times specific heat for snow      = ', rcpsn   , ' J/m^3/K'  
    193193         WRITE(numout,*) '          density times specific heat for ice       = ', rcpic   , ' J/m^3/K' 
Note: See TracChangeset for help on using the changeset viewer.