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 6645 for branches/NERC – NEMO

Changeset 6645 for branches/NERC


Ignore:
Timestamp:
2016-05-31T14:24:55+02:00 (8 years ago)
Author:
jpalmier
Message:

JPALM -- 31-05-2016 -- avoid merge conflicts second tour

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/trcini.F90

    r6644 r6645  
    159159            CALL wrk_alloc( jpi, jpj, jpk, ztrcdta )    ! Memory allocation 
    160160            ! 
    161 #if defined key_medusa 
    162             IF(lwp) WRITE(numout,*) 'AXY: calling trc_dta' 
    163             IF(lwp) CALL flush(numout) 
    164 #endif 
    165161            DO jn = 1, jptra 
    166162               IF( ln_trc_ini(jn) ) THEN      ! update passive tracers arrays with input data read from file 
     
    169165                  ztrcdta(:,:,:) = sf_trcdta(jl)%fnow(:,:,:) 
    170166                  trn(:,:,:,jn) = ztrcdta(:,:,:) * tmask(:,:,:)   
    171                   IF( .NOT.ln_trcdmp .AND. .NOT. ln_trcdmp_clo ) THEN      !== deallocate data structure   ==! 
     167                  IF( .NOT.ln_trcdmp .AND. .NOT.ln_trcdmp_clo ) THEN      !== deallocate data structure   ==! 
    172168                     !                                                    (data used only for initialisation) 
    173169                     IF(lwp) WRITE(numout,*) 'trc_dta: deallocate data arrays as they are only used to initialize the run' 
Note: See TracChangeset for help on using the changeset viewer.