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 7646 for trunk/NEMOGCM/NEMO/OPA_SRC/trc_oce.F90 – NEMO

Ignore:
Timestamp:
2017-02-06T10:25:03+01:00 (7 years ago)
Author:
timgraham
Message:

Merge of dev_merge_2016 into trunk. UPDATE TO ARCHFILES NEEDED for XIOS2.
LIM_SRC_s/limrhg.F90 to follow in next commit due to change of kind (I'm unable to do it in this commit).
Merged using the following steps:

1) svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk .
2) Resolve minor conflicts in sette.sh and namelist_cfg for ORCA2LIM3 (due to a change in trunk after branch was created)
3) svn commit
4) svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
5) svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_merge_2016 .
6) At this stage I checked out a clean copy of the branch to compare against what is about to be committed to the trunk.
6) svn commit #Commit code to the trunk

In this commit I have also reverted a change to Fcheck_archfile.sh which was causing problems on the Paris machine.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/NEMOGCM/NEMO/OPA_SRC/trc_oce.F90

    r6140 r7646  
    2424   PUBLIC   trc_oce_alloc      ! function called by nemogcm.F90 
    2525 
     26   LOGICAL , PUBLIC                                      ::   l_co2cpl  = .false.   !: atmospheric pco2 recieved from oasis 
     27   LOGICAL , PUBLIC                                     ::   l_offline = .false.   !: offline passive tracers flag 
    2628   INTEGER , PUBLIC                                      ::   nn_dttrc      !: frequency of step on passive tracers 
    2729   REAL(wp), PUBLIC                                      ::   r_si2         !: largest depth of extinction (blue & 0.01 mg.m-3)  (RGB) 
    2830   REAL(wp), PUBLIC, SAVE, ALLOCATABLE, DIMENSION(:,:,:) ::   etot3         !: light absortion coefficient 
    29    REAL(wp), PUBLIC, SAVE, ALLOCATABLE, DIMENSION(:,:,:) ::   facvol        !: volume for degraded regions 
     31   REAL(wp), PUBLIC, SAVE, ALLOCATABLE, DIMENSION(:,:)   ::   oce_co2   !: ocean carbon flux 
    3032 
    3133#if defined key_top  
    … …  
    3436   !!---------------------------------------------------------------------- 
    3537   LOGICAL, PUBLIC, PARAMETER ::   lk_top     = .TRUE.   !: TOP model 
    36    LOGICAL, PUBLIC, PARAMETER ::   lk_qsr_bio = .TRUE.   !: bio-model light absorption flag 
    3738#else 
    3839   !!---------------------------------------------------------------------- 
    … …  
    4041   !!---------------------------------------------------------------------- 
    4142   LOGICAL, PUBLIC, PARAMETER ::   lk_top     = .FALSE.   !: TOP model 
    42    LOGICAL, PUBLIC, PARAMETER ::   lk_qsr_bio = .FALSE.   !: bio-model light absorption flag 
    43 #endif 
    44 #if defined key_offline 
    45    !!---------------------------------------------------------------------- 
    46    !!   'key_offline'                                     OFFLINE mode           
    47    !!---------------------------------------------------------------------- 
    48    LOGICAL, PUBLIC, PARAMETER ::   lk_offline = .TRUE.   !: offline flag 
    49 #else 
    50    !!---------------------------------------------------------------------- 
    51    !!   Default option                                   NO  OFFLINE mode           
    52    !!---------------------------------------------------------------------- 
    53    LOGICAL, PUBLIC, PARAMETER ::   lk_offline = .FALSE.   !: offline flag 
    54 #endif 
    55 #if defined key_degrad 
    56    !!---------------------------------------------------------------------- 
    57    !!   'key_degrad'                                     Degradation mode           
    58    !!---------------------------------------------------------------------- 
    59    LOGICAL, PUBLIC, PARAMETER ::   lk_degrad = .TRUE.   !: degradation flag 
    60 #else 
    61    !!---------------------------------------------------------------------- 
    62    !!   Default option                                   NO  Degradation mode           
    63    !!---------------------------------------------------------------------- 
    64    LOGICAL, PUBLIC, PARAMETER ::   lk_degrad = .FALSE.   !: degradation flag 
    6543#endif 
    6644   !!---------------------------------------------------------------------- 
    … …  
    7553      !!                  ***  trc_oce_alloc  *** 
    7654      !!---------------------------------------------------------------------- 
    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 ) 
    83       ! 
     55      ALLOCATE( etot3(jpi,jpj,jpk), oce_co2(jpi,jpj), STAT=trc_oce_alloc ) 
    8456      IF( trc_oce_alloc /= 0 )   CALL ctl_warn('trc_oce_alloc: failed to allocate etot3 array') 
     57      ! 
    8558   END FUNCTION trc_oce_alloc 
    8659 
    … …  
    11083      IF(lwp) THEN 
    11184         WRITE(numout,*) 
    112          WRITE(numout,*) 'trc_oce_rgb : Initialisation of the optical look-up table' 
    113          WRITE(numout,*) '~~~~~~~~~~~ ' 
     85         WRITE(numout,*) '   trc_oce_rgb : Initialisation of the optical look-up table' 
     86         WRITE(numout,*) '   ~~~~~~~~~~~ ' 
    11487      ENDIF 
    11588      ! 
Note: See TracChangeset for help on using the changeset viewer.