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 6432 – NEMO

Changeset 6432


Ignore:
Timestamp:
2016-04-06T09:51:41+02:00 (8 years ago)
Author:
timgraham
Message:

More bug fixes. Now compiles and passes SETTE tests

Location:
branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM/NEMO/OPA_SRC
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90

    r6431 r6432  
    3838   PUBLIC   dia_ptr_init   ! call in step module 
    3939   PUBLIC   dia_ptr        ! call in step module 
     40   PUBLIC   dia_ptr_ohst_components        ! called from tra_ldf/tra_adv routines 
    4041 
    4142   !                                  !!** namelist  namptr  ** 
    … …  
    4647   LOGICAL, PUBLIC ::   ln_diaptr   !  Poleward transport flag (T) or not (F) 
    4748   LOGICAL, PUBLIC ::   ln_subbas   !  Atlantic/Pacific/Indian basins calculation 
    48    INTEGER        ::   nptr        ! = 1 (l_subbas=F) or = 5 (glo, atl, pac, ind, ipc) (l_subbas=T)  
     49   INTEGER, PUBLIC ::   nptr        ! = 1 (l_subbas=F) or = 5 (glo, atl, pac, ind, ipc) (l_subbas=T)  
    4950 
    5051   REAL(wp) ::   rc_sv    = 1.e-6_wp   ! conversion from m3/s to Sverdrup 

  • branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90

    r6428 r6432  
    285285                   CALL wrk_dealloc( jpi, jpj, jpk, zwi, zwz ) 
    286286      IF( l_trd )  CALL wrk_dealloc( jpi, jpj, jpk, ztrdx, ztrdy, ztrdz ) 
    287       IF( cdtype == 'TRA' .AND. ln_diaptr ) THEN wrk_dealloc( jpi, nptr, ptr_adv_tmp ) 
     287      IF( cdtype == 'TRA' .AND. ln_diaptr ) CALL wrk_dealloc( jpi, nptr, ptr_adv_tmp ) 
    288288      ! 
    289289      IF( nn_timing == 1 )  CALL timing_stop('tra_adv_tvd') 
    … …  
    333333      REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrdx, ztrdy, ztrdz 
    334334      REAL(wp), POINTER, DIMENSION(:,:,:,:) :: ztrs 
     335      REAL(wp), POINTER, DIMENSION(:,:) :: ptr_adv_tmp 
    335336      !!---------------------------------------------------------------------- 
    336337      ! 
    … …  
    591592                   CALL wrk_dealloc( jpi, jpj, zwx_sav, zwy_sav ) 
    592593      IF( l_trd )  CALL wrk_dealloc( jpi, jpj, jpk, ztrdx, ztrdy, ztrdz ) 
    593       IF( cdtype == 'TRA' .AND. ln_diaptr ) THEN wrk_dealloc( jpi, nptr, ptr_adv_tmp ) 
     594      IF( cdtype == 'TRA' .AND. ln_diaptr ) CALL wrk_dealloc( jpi, nptr, ptr_adv_tmp ) 
    594595      ! 
    595596      IF( nn_timing == 1 )  CALL timing_stop('tra_adv_tvd_zts') 
Note: See TracChangeset for help on using the changeset viewer.