Changeset 10976


Ignore:
Timestamp:
2019-05-14T14:44:55+02:00 (18 months ago)
Author:
acc
Message:

2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps : Convert usrdef routines in tests MY_SRC directories to enable SETTE compilation and testing of TEST-CASES (non-AGRIF varieties at least; enables ISOMIP, OVERFLOW and LOCK_EXCHANGE)

Location:
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/tests
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/tests/BENCH/MY_SRC/usrdef_sbc.F90

    r10179 r10976  
    4141CONTAINS 
    4242 
    43    SUBROUTINE usrdef_sbc_oce( kt ) 
     43   SUBROUTINE usrdef_sbc_oce( kt, Kbb ) 
    4444      !!--------------------------------------------------------------------- 
    4545      !!                    ***  ROUTINE usr_def_sbc  *** 
     
    5656      !!---------------------------------------------------------------------- 
    5757      INTEGER, INTENT(in) ::   kt   ! ocean time step 
     58      INTEGER, INTENT(in) ::   Kbb  ! ocean time index 
    5859      !!--------------------------------------------------------------------- 
    5960      !      
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/tests/CANAL/MY_SRC/usrdef_sbc.F90

    r10074 r10976  
    4040CONTAINS 
    4141 
    42    SUBROUTINE usrdef_sbc_oce( kt ) 
     42   SUBROUTINE usrdef_sbc_oce( kt, Kbb ) 
    4343      !!--------------------------------------------------------------------- 
    4444      !!                    ***  ROUTINE usr_def_sbc  *** 
     
    5555      !!---------------------------------------------------------------------- 
    5656      INTEGER, INTENT(in) ::   kt   ! ocean time step 
    57        
     57      INTEGER, INTENT(in) ::   Kbb  ! ocean time index 
    5858      INTEGER  ::   ji, jj               ! dummy loop indices 
    5959      REAL(wp) :: zrhoair = 1.22     ! approximate air density [Kg/m3] 
     
    105105   END SUBROUTINE usrdef_sbc_ice_tau 
    106106 
    107    SUBROUTINE usrdef_sbc_ice_flx( kt ) 
     107 
     108   SUBROUTINE usrdef_sbc_ice_flx( kt, phs, phi ) 
    108109      INTEGER, INTENT(in) ::   kt   ! ocean time step 
     110      REAL(wp), DIMENSION(:,:,:), INTENT(in)  ::   phs    ! snow thickness 
     111      REAL(wp), DIMENSION(:,:,:), INTENT(in)  ::   phi    ! ice thickness 
    109112   END SUBROUTINE usrdef_sbc_ice_flx 
    110113 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/tests/ICE_ADV1D/MY_SRC/usrdef_sbc.F90

    r10513 r10976  
    4242CONTAINS 
    4343 
    44    SUBROUTINE usrdef_sbc_oce( kt ) 
     44   SUBROUTINE usrdef_sbc_oce( kt, Kbb ) 
    4545      !!--------------------------------------------------------------------- 
    4646      !!                    ***  ROUTINE usr_def_sbc  *** 
     
    5757      !!---------------------------------------------------------------------- 
    5858      INTEGER, INTENT(in) ::   kt   ! ocean time step 
     59      INTEGER, INTENT(in) ::   Kbb  ! ocean time index 
    5960      !!--------------------------------------------------------------------- 
    6061      ! 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/tests/ICE_ADV2D/MY_SRC/usrdef_sbc.F90

    r10515 r10976  
    4242CONTAINS 
    4343 
    44    SUBROUTINE usrdef_sbc_oce( kt ) 
     44   SUBROUTINE usrdef_sbc_oce( kt, Kbb ) 
    4545      !!--------------------------------------------------------------------- 
    4646      !!                    ***  ROUTINE usr_def_sbc  *** 
     
    5757      !!---------------------------------------------------------------------- 
    5858      INTEGER, INTENT(in) ::   kt   ! ocean time step 
     59      INTEGER, INTENT(in) ::   Kbb  ! ocean time index 
    5960      !!--------------------------------------------------------------------- 
    6061      ! 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/tests/ICE_AGRIF/MY_SRC/usrdef_sbc.F90

    r10516 r10976  
    4242CONTAINS 
    4343 
    44    SUBROUTINE usrdef_sbc_oce( kt ) 
     44   SUBROUTINE usrdef_sbc_oce( kt, Kbb ) 
    4545      !!--------------------------------------------------------------------- 
    4646      !!                    ***  ROUTINE usr_def_sbc  *** 
     
    5757      !!---------------------------------------------------------------------- 
    5858      INTEGER, INTENT(in) ::   kt   ! ocean time step 
     59      INTEGER, INTENT(in) ::   Kbb  ! ocean time index 
    5960      !!--------------------------------------------------------------------- 
    6061      ! 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/tests/ISOMIP/MY_SRC/usrdef_sbc.F90

    r10074 r10976  
    11MODULE usrdef_sbc 
    22   !!====================================================================== 
    3    !!                       ***  MODULE usrdef_sbc  *** 
     3   !!                     ***  MODULE usrdef_sbc  *** 
    44   !!  
    55   !!                  ===  ISOMIP configuration  === 
     
    4141CONTAINS 
    4242 
    43    SUBROUTINE usrdef_sbc_oce( kt ) 
     43   SUBROUTINE usrdef_sbc_oce( kt, Kbb ) 
    4444      !!--------------------------------------------------------------------- 
    4545      !!                    ***  ROUTINE usr_def_sbc  *** 
     
    5656      !!---------------------------------------------------------------------- 
    5757      INTEGER, INTENT(in) ::   kt   ! ocean time step 
     58      INTEGER, INTENT(in) ::   Kbb  ! ocean time index 
    5859      !!--------------------------------------------------------------------- 
    5960      ! 
     
    8182   END SUBROUTINE usrdef_sbc_ice_tau 
    8283 
    83    SUBROUTINE usrdef_sbc_ice_flx( kt ) 
     84 
     85   SUBROUTINE usrdef_sbc_ice_flx( kt, phs, phi ) 
    8486      INTEGER, INTENT(in) ::   kt   ! ocean time step 
     87      REAL(wp), DIMENSION(:,:,:), INTENT(in)  ::   phs    ! snow thickness 
     88      REAL(wp), DIMENSION(:,:,:), INTENT(in)  ::   phi    ! ice thickness 
    8589   END SUBROUTINE usrdef_sbc_ice_flx 
    8690 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/tests/LOCK_EXCHANGE/MY_SRC/usrdef_sbc.F90

    r10074 r10976  
    4040CONTAINS 
    4141 
    42    SUBROUTINE usrdef_sbc_oce( kt ) 
     42   SUBROUTINE usrdef_sbc_oce( kt, Kbb ) 
    4343      !!--------------------------------------------------------------------- 
    4444      !!                    ***  ROUTINE usr_def_sbc  *** 
     
    5555      !!---------------------------------------------------------------------- 
    5656      INTEGER, INTENT(in) ::   kt   ! ocean time step 
     57      INTEGER, INTENT(in) ::   Kbb  ! ocean time index 
    5758      !!--------------------------------------------------------------------- 
    5859      ! 
     
    8081   END SUBROUTINE usrdef_sbc_ice_tau 
    8182 
    82    SUBROUTINE usrdef_sbc_ice_flx( kt ) 
     83 
     84   SUBROUTINE usrdef_sbc_ice_flx( kt, phs, phi ) 
    8385      INTEGER, INTENT(in) ::   kt   ! ocean time step 
     86      REAL(wp), DIMENSION(:,:,:), INTENT(in)  ::   phs    ! snow thickness 
     87      REAL(wp), DIMENSION(:,:,:), INTENT(in)  ::   phi    ! ice thickness 
    8488   END SUBROUTINE usrdef_sbc_ice_flx 
    8589 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/tests/OVERFLOW/MY_SRC/usrdef_sbc.F90

    r10074 r10976  
    4040CONTAINS 
    4141 
    42    SUBROUTINE usrdef_sbc_oce( kt ) 
     42   SUBROUTINE usrdef_sbc_oce( kt, Kbb ) 
    4343      !!--------------------------------------------------------------------- 
    4444      !!                    ***  ROUTINE usr_def_sbc  *** 
     
    5555      !!---------------------------------------------------------------------- 
    5656      INTEGER, INTENT(in) ::   kt   ! ocean time step 
     57      INTEGER, INTENT(in) ::   Kbb  ! ocean time index 
    5758      !!--------------------------------------------------------------------- 
    5859      ! 
     
    8081   END SUBROUTINE usrdef_sbc_ice_tau 
    8182 
    82    SUBROUTINE usrdef_sbc_ice_flx( kt ) 
     83 
     84   SUBROUTINE usrdef_sbc_ice_flx( kt, phs, phi ) 
    8385      INTEGER, INTENT(in) ::   kt   ! ocean time step 
     86      REAL(wp), DIMENSION(:,:,:), INTENT(in)  ::   phs    ! snow thickness 
     87      REAL(wp), DIMENSION(:,:,:), INTENT(in)  ::   phi    ! ice thickness 
    8488   END SUBROUTINE usrdef_sbc_ice_flx 
    8589 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/tests/VORTEX/MY_SRC/usrdef_sbc.F90

    r10074 r10976  
    3939CONTAINS 
    4040 
    41    SUBROUTINE usrdef_sbc_oce( kt ) 
     41   SUBROUTINE usrdef_sbc_oce( kt, Kbb ) 
    4242      !!--------------------------------------------------------------------- 
    4343      !!                    ***  ROUTINE usr_def_sbc  *** 
     
    5454      !!---------------------------------------------------------------------- 
    5555      INTEGER, INTENT(in) ::   kt   ! ocean time step 
     56      INTEGER, INTENT(in) ::   Kbb  ! ocean time index 
    5657      !!--------------------------------------------------------------------- 
    5758      ! 
     
    7980   END SUBROUTINE usrdef_sbc_ice_tau 
    8081 
    81    SUBROUTINE usrdef_sbc_ice_flx( kt ) 
     82 
     83   SUBROUTINE usrdef_sbc_ice_flx( kt, phs, phi ) 
    8284      INTEGER, INTENT(in) ::   kt   ! ocean time step 
     85      REAL(wp), DIMENSION(:,:,:), INTENT(in)  ::   phs    ! snow thickness 
     86      REAL(wp), DIMENSION(:,:,:), INTENT(in)  ::   phi    ! ice thickness 
    8387   END SUBROUTINE usrdef_sbc_ice_flx 
    8488 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/tests/WAD/MY_SRC/usrdef_sbc.F90

    r10074 r10976  
    4040CONTAINS 
    4141 
    42    SUBROUTINE usrdef_sbc_oce( kt ) 
     42   SUBROUTINE usrdef_sbc_oce( kt, Kbb ) 
    4343      !!--------------------------------------------------------------------- 
    4444      !!                    ***  ROUTINE usr_def_sbc  *** 
     
    5555      !!---------------------------------------------------------------------- 
    5656      INTEGER, INTENT(in) ::   kt   ! ocean time step 
     57      INTEGER, INTENT(in) ::   Kbb  ! ocean time index 
    5758      !!--------------------------------------------------------------------- 
    5859      ! 
     
    8081   END SUBROUTINE usrdef_sbc_ice_tau 
    8182 
    82    SUBROUTINE usrdef_sbc_ice_flx( kt ) 
     83 
     84   SUBROUTINE usrdef_sbc_ice_flx( kt, phs, phi ) 
    8385      INTEGER, INTENT(in) ::   kt   ! ocean time step 
     86      REAL(wp), DIMENSION(:,:,:), INTENT(in)  ::   phs    ! snow thickness 
     87      REAL(wp), DIMENSION(:,:,:), INTENT(in)  ::   phi    ! ice thickness 
    8488   END SUBROUTINE usrdef_sbc_ice_flx 
    8589 
Note: See TracChangeset for help on using the changeset viewer.