Changeset 9198


Ignore:
Timestamp:
2018-01-09T14:29:30+01:00 (3 years ago)
Author:
gm
Message:

dev_merge_2017: domzgr.F90: bug correction of closed sea when ln_read_cfg=F

Location:
branches/2017/dev_merge_2017/NEMOGCM
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/namelist_cfg

    r9169 r9198  
    1616      !                    !  (=F) user defined configuration  ==>>>  see usrdef(_...) modules 
    1717      cn_domcfg = "ORCA_R2_zps_domcfg"    ! domain configuration filename 
     18      !                    !  (=F) user defined configuration  ==>>>  see usrdef(_...) modules 
     19   ln_closea    = .false.  !  T => keep closed seas (defined by closea_mask field) in the domain and apply 
     20      !                    !       special treatment of freshwater fluxes. 
     21      !                    !  F => suppress closed seas (defined by closea_mask field) from the bathymetry 
     22      !                    !       at runtime. 
     23      !                    !  If there is no closea_mask field in the domain_cfg file or we do not use 
     24      !                    !  a domain_cfg file then this logical does nothing. 
    1825/ 
    1926!----------------------------------------------------------------------- 
     
    2734/ 
    2835!----------------------------------------------------------------------- 
    29 &namtsd    !   data : Temperature  & Salinity 
     36&namtsd        !   data : Temperature  & Salinity 
    3037!----------------------------------------------------------------------- 
    3138/ 
     
    3643/ 
    3744!----------------------------------------------------------------------- 
    38 &namsbc_blk   !   namsbc_blk  Bulk formulae 
     45&namsbc_blk    !   namsbc_blk  Bulk formulae 
    3946!----------------------------------------------------------------------- 
    4047   ln_NCAR     = .true.   ! "NCAR"      algorithm   (Large and Yeager 2008) 
     
    4552/ 
    4653!----------------------------------------------------------------------- 
    47 &namsbc_cpl 
     54&namsbc_cpl    ! 
    4855!----------------------------------------------------------------------- 
    4956/ 
  • branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/cpp_ORCA2_LIM3_PISCES.fcm

    r9139 r9198  
    1 bld::tool::fppkeys   key_lim3 key_top key_iomput key_mpp_mpi key_nosignedzero 
     1bld::tool::fppkeys   key_lim3 key_iomput key_mpp_mpi key_nosignedzero 
  • branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_ref

    r9169 r9198  
    8181   ln_use_jattr = .false.  !  use (T) the file attribute: open_ocean_jstart, if present 
    8282   !                       !  in netcdf input files, as the start j-row for reading 
    83    ln_closea = .true.      !  T => keep closed seas (defined by closea_mask field) in the domain and apply 
    84                            !       special treatment of freshwater fluxes. 
    85                            !  F => suppress closed seas (defined by closea_mask field) from the bathymetry 
    86                            !       at runtime. 
    87                            !  If there is no closea_mask field in the domain_cfg file or we do not use 
    88                            !  a domain_cfg file then this logical does nothing. 
     83   ln_closea    = .true.   !  T => keep closed seas (defined by closea_mask field) in the domain and apply 
     84      !                    !       special treatment of freshwater fluxes. 
     85      !                    !  F => suppress closed seas (defined by closea_mask field) from the bathymetry 
     86      !                    !       at runtime. 
     87      !                    !  If there is no closea_mask field in the domain_cfg file or we do not use 
     88      !                    !  a domain_cfg file then this logical does nothing. 
    8989/ 
    9090!----------------------------------------------------------------------- 
  • branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

    r9169 r9198  
    9595            &              e3w_0   , e3uw_0  , e3vw_0           ,   &    ! vertical scale factors 
    9696            &              k_top   , k_bot            )                  ! 1st & last ocean level 
     97            ! 
     98         ! Any closed seas (defined by closea_mask > 0 in domain_cfg file) to be filled  
     99         ! in at runtime if ln_closea=.false. 
     100         IF( .NOT.ln_closea )   CALL clo_bat( k_top, k_bot ) 
    97101         ! 
    98102      ELSE                          !==  User defined configuration  ==! 
     
    115119         gde3w_0(:,:,jk) = gde3w_0(:,:,jk-1) + e3w_0(:,:,jk) 
    116120      END DO 
    117       ! 
    118       ! Any closed seas (defined by closea_mask > 0 in domain_cfg file) to be filled  
    119       ! in at runtime if ln_closea=.false. 
    120       IF( .not. ln_closea ) CALL clo_bat( k_top, k_bot ) 
    121121      ! 
    122122      IF(lwp) THEN                     ! Control print 
Note: See TracChangeset for help on using the changeset viewer.