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 2833 for branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM – NEMO

Ignore:
Timestamp:
2011-09-13T11:37:04+02:00 (13 years ago)
Author:
cetlod
Message:

dev_r2787_LOCEAN3_TRA_TRP:correct minor bug to avoid compilation error

Location:
branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/OFF_SRC/dommsk.F90

    r2715 r2833  
    1919 
    2020   PUBLIC   dom_msk    ! routine called by inidom.F90 
    21  
    22    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   facvol   !: volume for degraded regions 
    2321 
    2422   !! * Substitutions 
     
    5654      END IF 
    5755      ! 
    58 #if defined key_degrad 
    59       IF( dom_msk_alloc() /= 0 )   CALL ctl_stop('STOP','dom_msk: unable to allocate arrays') 
    60 #endif 
    61  
    6256      ! Interior domain mask (used for global sum) 
    6357      ! -------------------- 
     
    10498      ! 
    10599   END SUBROUTINE dom_msk 
    106  
    107  
    108    INTEGER FUNCTION dom_msk_alloc() 
    109       !!--------------------------------------------------------------------- 
    110       !!                 ***  FUNCTION dom_msk_alloc  *** 
    111       !!--------------------------------------------------------------------- 
    112       ALLOCATE( facvol(jpi,jpj,jpk) , STAT=dom_msk_alloc ) 
    113       IF( dom_msk_alloc /= 0 )   CALL ctl_warn('dom_msk_alloc : failed to allocate facvol array') 
    114       ! 
    115    END FUNCTION dom_msk_alloc 
    116  
    117100   !!====================================================================== 
    118101END MODULE dommsk 
  • branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/OFF_SRC/domrea.F90

    r2787 r2833  
    1616   USE dommsk          ! domain: masks 
    1717   USE lbclnk          ! lateral boundary condition - MPP exchanges 
     18   USE trc_oce         ! shared ocean/biogeochemical variables 
    1819   USE lib_mpp  
    1920   USE in_out_manager 
  • branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/OPA_SRC/trc_oce.F90

    r2819 r2833  
    2525   REAL(wp), PUBLIC                                      ::   r_si2   !: largest depth of extinction (blue & 0.01 mg.m-3)  (RGB) 
    2626   REAL(wp), PUBLIC, SAVE, ALLOCATABLE, DIMENSION(:,:,:) ::   etot3   !: light absortion coefficient 
     27   REAL(wp), PUBLIC, SAVE, ALLOCATABLE, DIMENSION(:,:,:) ::   facvol   !: volume for degraded regions 
    2728 
    2829#if defined key_top && defined key_pisces 
     
    7475      !!                  ***  trc_oce_alloc  *** 
    7576      !!---------------------------------------------------------------------- 
    76       ALLOCATE( etot3(jpi,jpj,jpk)   , STAT= trc_oce_alloc ) 
     77      INTEGER ::   ierr(2)        ! Local variables 
     78      !!---------------------------------------------------------------------- 
     79      ierr(:) = 0 
     80                     ALLOCATE( etot3 (jpi,jpj,jpk), STAT=ierr(1) ) 
     81      IF( lk_degrad) ALLOCATE( facvol(jpi,jpj,jpk), STAT=ierr(2) ) 
     82      trc_oce_alloc  = MAXVAL( ierr ) 
    7783      ! 
    7884      IF( trc_oce_alloc /= 0 )   CALL ctl_warn('trc_oce_alloc: failed to allocate etot3 array') 
Note: See TracChangeset for help on using the changeset viewer.