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 11053 for NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/TOP – NEMO

Ignore:
Timestamp:
2019-05-24T12:53:06+02:00 (5 years ago)
Author:
davestorkey
Message:

2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap : Merge in latest changes from main branch and finish conversion of "h" variables. NB. This version still doesn't work!

Location:
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/TOP
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/TOP/oce_trc.F90

    r10963 r11053  
    3434 
    3535   !* ocean fields: here now and after fields * 
    36    USE oce , ONLY :   tsn     =>    tsn     !: 4D array contaning ( tn, sn ) !TEMPORARY 
    37    USE oce , ONLY :   tsb     =>    tsb     !: 4D array contaning ( tb, sb ) !TEMPORARY 
    38    USE oce , ONLY :   tsa     =>    tsa     !: 4D array contaning ( ta, sa ) !TEMPORARY 
    39    USE oce , ONLY :   sshn    =>    sshn    !: sea surface height at t-point [m]    !TEMPORARY 
    40    USE oce , ONLY :   sshb    =>    sshb    !: sea surface height at t-point [m]    !TEMPORARY 
    41    USE oce , ONLY :   ssha    =>    ssha    !: sea surface height at t-point [m]    !TEMPORARY 
    42    USE oce , ONLY :    un     =>     un     !: 4D array  !TEMPORARY 
    43    USE oce , ONLY :    vn     =>     vn     !: 4D array  !TEMPORARY 
    44    USE oce , ONLY :    wn     =>     wn     !: 4D array  !TEMPORARY 
    4536   USE oce , ONLY :   uu     =>    uu     !: i-horizontal velocity (m s-1)  
    4637   USE oce , ONLY :   vv     =>    vv     !: j-horizontal velocity (m s-1) 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/TOP/trc.F90

    r10880 r11053  
    3333   REAL(wp), PUBLIC                                        ::  areatot        !: total volume  
    3434   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:  ) ::  cvol           !: volume correction -degrad option-  
    35    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:,:), TARGET ::  tr             !: tracer concentration  
     35   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:,:) ::  tr           !: tracer concentration  
    3636   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:  ) ::  sbc_trc_b      !: Before sbc fluxes for tracers 
    3737   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:  ) ::  sbc_trc        !: Now sbc fluxes for tracers 
    … …  
    4040   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:  ) ::  trc_o          !: prescribed tracer concentration in ocean for SBC 
    4141   INTEGER             , PUBLIC                            ::  nn_ice_tr      !: handling of sea ice tracers 
    42  
    43    !! TEMPORARY POINTERS - TO BE DELETED AFTER IMMERSE DEVELOPMENT COMPLETE 
    44    REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:,:,:)   ::  trn            !: tracer concentration for now time step 
    45    REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:,:,:)   ::  tra            !: tracer concentration for next time step 
    46    REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:,:,:)   ::  trb            !: tracer concentration for before time step 
    47    !! TEMPORARY POINTERS - TO BE DELETED AFTER IMMERSE DEVELOPMENT COMPLETE 
    4842 
    4943   !! interpolated gradient 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/TOP/trcini.F90

    r10975 r11053  
    5252      !!                or read data or analytical formulation 
    5353      !!--------------------------------------------------------------------- 
    54       !! Time level indices only required for call to update_pointers_trc 
    55       !! To be removed after IMMERSE development finished.  
    5654      INTEGER, INTENT( in ) :: Kbb, Kmm, Kaa ! time level indices 
    5755      ! 
    … …  
    6664      CALL top_alloc()   ! allocate TOP arrays 
    6765 
    68       ! Initialisation of temporary pointers (to be deleted after development finished) 
    69       CALL update_pointers_trc( Kbb, Kmm, Kaa ) 
    7066      ! 
    7167      IF(.NOT.ln_trcdta )   ln_trc_ini(:) = .FALSE. 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/TOP/trcstp.F90

    r10975 r11053  
    3030 
    3131   PUBLIC   trc_stp    ! called by step 
    32    PUBLIC   update_pointers_trc ! called in initialisation 
    3332 
    3433   LOGICAL  ::   llnew                   ! ??? 
    … …  
    126125      ! 
    127126   END SUBROUTINE trc_stp 
    128  
    129    SUBROUTINE update_pointers_trc( Kbb, Kmm, Kaa ) 
    130       !!---------------------------------------------------------------------- 
    131       !!                     ***  ROUTINE update_pointers_trc  *** 
    132       !! 
    133       !! ** Purpose :   Associate temporary pointer arrays. 
    134       !!                For IMMERSE development phase only - to be deleted 
    135       !! 
    136       !! ** Method  : 
    137       !!---------------------------------------------------------------------- 
    138       INTEGER, INTENT( in ) :: Kbb, Kmm, Kaa ! time level indices 
    139  
    140       trb => tr(:,:,:,:,Kbb); trn => tr(:,:,:,:,Kmm); tra => tr(:,:,:,:,Kaa) 
    141  
    142    END SUBROUTINE update_pointers_trc 
    143127 
    144128   SUBROUTINE trc_mean_qsr( kt ) 
Note: See TracChangeset for help on using the changeset viewer.