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 10323 for NEMO/branches/UKMO/dev_r9950_GO6_mixing/src/TOP/PISCES/trcice_pisces.F90 – NEMO

Ignore:
Timestamp:
2018-11-16T16:13:30+01:00 (5 years ago)
Author:
davestorkey
Message:

UKMO/dev_r9950_GO6_mixing: Update to be relative to rev 10321 of NEMO4_beta_mirror branch.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/UKMO/dev_r9950_GO6_mixing/src/TOP/PISCES/trcice_pisces.F90

    • Property svn:keywords set to Id
    r9950 r10323  
    2323   !! NEMO/TOP 4.0 , NEMO Consortium (2018) 
    2424   !! $Id$ 
    25    !! Software governed by the CeCILL licence (./LICENSE) 
     25   !! Software governed by the CeCILL license (see ./LICENSE) 
    2626   !!---------------------------------------------------------------------- 
    2727CONTAINS 
     
    273273            WHERE( gphit(:,:) <  0._wp ) ; trc_o(:,:,jn) = zpisc(jn,3) ; END WHERE ! Antarctic  
    274274         ENDIF 
    275          IF( cn_cfg == "orca" ) THEN     !  Baltic Sea particular case for ORCA configurations 
     275         IF( cn_cfg == "orca" .OR. cn_cfg == "ORCA" ) THEN     !  Baltic Sea particular case for ORCA configurations 
    276276             WHERE( 14._wp <= glamt(:,:) .AND. glamt(:,:) <= 32._wp .AND.    & 
    277277                    54._wp <= gphit(:,:) .AND. gphit(:,:) <= 66._wp ) 
     
    312312        
    313313         !-- Baltic 
    314          IF( cn_cfg == "orca" ) THEN  ! Baltic treated seperately for ORCA configs 
     314         IF( cn_cfg == "orca" .OR. cn_cfg == "ORCA" ) THEN      
    315315            IF ( trc_ice_ratio(jn) >= - 1._wp ) THEN ! no prescribed conc. ; typically everything but iron)  
    316316               WHERE( 14._wp <= glamt(:,:) .AND. glamt(:,:) <= 32._wp .AND.    & 
Note: See TracChangeset for help on using the changeset viewer.