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 10345 for NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/TOP/PISCES/trcice_pisces.F90 – NEMO

Ignore:
Timestamp:
2018-11-21T11:25:53+01:00 (5 years ago)
Author:
smasson
Message:

dev_r10164_HPC09_ESIWACE_PREP_MERGE: merge with trunk@10344, see #2133

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/TOP/PISCES/trcice_pisces.F90

    r10069 r10345  
    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.