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 9539 for branches/2017/dev_merge_2017/NEMOGCM/NEMO – NEMO

Ignore:
Timestamp:
2018-05-03T11:21:13+02:00 (6 years ago)
Author:
cetlod
Message:

dev_merge_2017 : validation of Offline configurations

Location:
branches/2017/dev_merge_2017/NEMOGCM/NEMO
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/2017/dev_merge_2017/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90

    r9436 r9539  
    109109         ! 
    110110         IF( istp /= nit000 )   CALL day        ( istp )         ! Calendar (day was already called at nit000 in day_init) 
    111                                 CALL iom_setkt  ( istp - nit000 + 1, "nemo" )   ! say to iom that we are at time step kstp 
     111                                CALL iom_setkt  ( istp - nit000 + 1, cxios_context )   ! say to iom that we are at time step kstp 
    112112                                CALL dta_dyn    ( istp )         ! Interpolation of the dynamical fields 
    113113         IF( .NOT.ln_linssh )   CALL dta_dyn_swp( istp )         ! swap of sea  surface height and vertical scale factors 

  • branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsed.F90

    r9125 r9539  
    119119      IF( ln_dust ) THEN 
    120120         !                                               
    121          ALLOCATE( zsidep(jpi,jpj) ) 
    122          ALLOCATE( zpdep(jpi,jpj,jpk), zirondep(jpi,jpj,jpk) ) 
     121         ALLOCATE( zsidep(jpi,jpj), zpdep(jpi,jpj,jpk), zirondep(jpi,jpj,jpk) ) 
    123122         !                                              ! Iron and Si deposition at the surface 
    124123         IF( ln_solub ) THEN 
    … …  
    138137         !                                              ! Iron solubilization of particles in the water column 
    139138         tra(:,:,1,jpsil) = tra(:,:,1,jpsil) + zsidep  (:,:) 
    140          tra(:,:,:,jppo4) = tra(:,:,:,jppo4) + zpdep   (:,:,:) 
    141          tra(:,:,:,jpfer) = tra(:,:,:,jpfer) + zirondep(:,:,:)  
     139         DO jk = 1, jpkm1 
     140            tra(:,:,jk,jppo4) = tra(:,:,jk,jppo4) + zpdep   (:,:,jk) 
     141            tra(:,:,jk,jpfer) = tra(:,:,jk,jpfer) + zirondep(:,:,jk)  
     142         ENDDO 
    142143         !  
    143144         IF( lk_iomput ) THEN 
    … …  
    149150            ENDIF 
    150151         ENDIF 
    151          DEALLOCATE( zsidep ) 
    152          DEALLOCATE( zpdep, zirondep ) 
     152         DEALLOCATE( zsidep, zpdep, zirondep ) 
    153153         !                                               
    154154      ENDIF 
Note: See TracChangeset for help on using the changeset viewer.