Skip to content
Snippets Groups Projects
Commit 75098ec1 authored by Clement Rousset's avatar Clement Rousset
Browse files

debug to compile test cases other than the ones in sette

parent e774b5e4
No related branches found
No related tags found
6 merge requests!655Resolve "Remove local working arrays and subroutine arguments that are no...,!453Resolve "minor bug in sbc_blk",!339Draft: Resolve "New Implementation: FormDrag in SI3 for NEMOv4.2.0",!327Resolve "DOMAINcfg does not compile with DOMAINcfg + AGRIF not compiling anymore with branch 4.2",!324Draft: Resolve "DOMAINcfg does not compile with DOMAINcfg + AGRIF not compiling anymore with branch 4.2",!216Draft: nemo 4.2, GLS: Top limit condition on TKE is duplicated for cavities
Hide whitespace changes
Inline Side-by-side
Showing
with 72 additions and 44 deletions
tests/BENCH/MY_SRC/usrdef_sbc.F90
+ 21
− 7
View file @ 75098ec1
...@@ -17,14 +17,14 @@ MODULE usrdef_sbc ...@@ -17,14 +17,14 @@ MODULE usrdef_sbc
USE oce ! ocean dynamics and tracers USE oce ! ocean dynamics and tracers
USE sbc_oce ! Surface boundary condition: ocean fields USE sbc_oce ! Surface boundary condition: ocean fields
USE sbc_ice ! Surface boundary condition: ocean fields USE sbc_ice ! Surface boundary condition: ocean fields
USE in_out_manager ! I/O manager USE sbc_phy, ONLY : pp_cldf
USE phycst ! physical constants USE phycst ! physical constants
USE lib_mpp ! MPP library
USE lbclnk ! lateral boundary conditions - mpp exchanges
#if defined key_si3 #if defined key_si3
USE ice, ONLY : at_i_b, a_i_b USE ice, ONLY : jpl, at_i_b, a_i_b
#endif #endif
USE in_out_manager ! I/O manager
USE lib_mpp ! MPP library
USE lbclnk ! lateral boundary conditions - mpp exchanges
IMPLICIT NONE IMPLICIT NONE
PRIVATE PRIVATE
...@@ -132,7 +132,10 @@ CONTAINS ...@@ -132,7 +132,10 @@ CONTAINS
REAL(wp), DIMENSION(:,:,:), INTENT(in) :: phs ! snow thickness REAL(wp), DIMENSION(:,:,:), INTENT(in) :: phs ! snow thickness
REAL(wp), DIMENSION(:,:,:), INTENT(in) :: phi ! ice thickness REAL(wp), DIMENSION(:,:,:), INTENT(in) :: phi ! ice thickness
!! !!
INTEGER :: jl
REAL(wp) :: zfr1, zfr2 ! local variables
REAL(wp), DIMENSION(A2D(0)) :: zsnw ! snw distribution after wind blowing REAL(wp), DIMENSION(A2D(0)) :: zsnw ! snw distribution after wind blowing
REAL(wp), DIMENSION(A2D(0)) :: ztri
!!--------------------------------------------------------------------- !!---------------------------------------------------------------------
#if defined key_si3 #if defined key_si3
! !
...@@ -166,8 +169,19 @@ CONTAINS ...@@ -166,8 +169,19 @@ CONTAINS
qns_tot (:,:) = at_i_b(:,:) * qns_oce(:,:) + SUM( a_i_b(:,:,:) * qns_ice(:,:,:), dim=3 ) + qemp_ice(:,:) + qemp_oce(:,:) qns_tot (:,:) = at_i_b(:,:) * qns_oce(:,:) + SUM( a_i_b(:,:,:) * qns_ice(:,:,:), dim=3 ) + qemp_ice(:,:) + qemp_oce(:,:)
qsr_tot (:,:) = at_i_b(:,:) * qsr_oce(:,:) + SUM( a_i_b(:,:,:) * qsr_ice(:,:,:), dim=3 ) qsr_tot (:,:) = at_i_b(:,:) * qsr_oce(:,:) + SUM( a_i_b(:,:,:) * qsr_ice(:,:,:), dim=3 )
! --- shortwave radiation transmitted thru the surface scattering layer (W/m2) --- ! ! --- shortwave radiation transmitted below the surface (W/m2, see Grenfell Maykut 77) --- !
qtr_ice_top(:,:,:) = 0._wp cloud_fra(:,:) = pp_cldf
ztri(:,:) = 0.18 * ( 1.0 - cloud_fra(:,:) ) + 0.35 * cloud_fra(:,:) ! surface transmission when hi>10cm
!
DO jl = 1, jpl
WHERE ( phs(A2D(0),jl) <= 0._wp .AND. phi(A2D(0),jl) < 0.1_wp ) ! linear decrease from hi=0 to 10cm
qtr_ice_top(:,:,jl) = qsr_ice(:,:,jl) * ( ztri(:,:) + ( 1._wp - ztri(:,:) ) * ( 1._wp - phi(A2D(0),jl) * 10._wp ) )
ELSEWHERE( phs(A2D(0),jl) <= 0._wp .AND. phi(A2D(0),jl) >= 0.1_wp ) ! constant (ztri) when hi>10cm
qtr_ice_top(:,:,jl) = qsr_ice(:,:,jl) * ztri(:,:)
ELSEWHERE ! zero when hs>0
qtr_ice_top(:,:,jl) = 0._wp
END WHERE
ENDDO
#endif #endif
END SUBROUTINE usrdef_sbc_ice_flx END SUBROUTINE usrdef_sbc_ice_flx
......
tests/DONUT/MY_SRC/usrdef_sbc.F90
+ 25
− 8
View file @ 75098ec1
...@@ -16,11 +16,12 @@ MODULE usrdef_sbc ...@@ -16,11 +16,12 @@ MODULE usrdef_sbc
USE dom_oce ! ocean space and time domain USE dom_oce ! ocean space and time domain
USE sbc_oce ! Surface boundary condition: ocean fields USE sbc_oce ! Surface boundary condition: ocean fields
USE sbc_ice ! Surface boundary condition: ice fields USE sbc_ice ! Surface boundary condition: ice fields
USE in_out_manager ! I/O manager USE sbc_phy, ONLY : pp_cldf
USE phycst ! physical constants USE phycst ! physical constants
#if defined key_si3 #if defined key_si3
USE ice, ONLY : at_i_b, a_i_b USE ice, ONLY : jpl, at_i_b, a_i_b
#endif #endif
USE in_out_manager ! I/O manager
IMPLICIT NONE IMPLICIT NONE
PRIVATE PRIVATE
...@@ -29,6 +30,8 @@ MODULE usrdef_sbc ...@@ -29,6 +30,8 @@ MODULE usrdef_sbc
PUBLIC usrdef_sbc_ice_tau ! routine called by icestp.F90 for ice dynamics PUBLIC usrdef_sbc_ice_tau ! routine called by icestp.F90 for ice dynamics
PUBLIC usrdef_sbc_ice_flx ! routine called by icestp.F90 for ice thermo PUBLIC usrdef_sbc_ice_flx ! routine called by icestp.F90 for ice thermo
!! * Substitutions
# include "do_loop_substitute.h90"
!!---------------------------------------------------------------------- !!----------------------------------------------------------------------
!! NEMO/OCE 4.0 , NEMO Consortium (2018) !! NEMO/OCE 4.0 , NEMO Consortium (2018)
!! $Id: usrdef_sbc.F90 10074 2018-08-28 16:15:49Z nicolasmartin $ !! $Id: usrdef_sbc.F90 10074 2018-08-28 16:15:49Z nicolasmartin $
...@@ -107,7 +110,10 @@ CONTAINS ...@@ -107,7 +110,10 @@ CONTAINS
REAL(wp), DIMENSION(:,:,:), INTENT(in) :: phs ! snow thickness REAL(wp), DIMENSION(:,:,:), INTENT(in) :: phs ! snow thickness
REAL(wp), DIMENSION(:,:,:), INTENT(in) :: phi ! ice thickness REAL(wp), DIMENSION(:,:,:), INTENT(in) :: phi ! ice thickness
!! !!
REAL(wp), DIMENSION(jpi,jpj) :: zsnw ! snw distribution after wind blowing INTEGER :: jl
REAL(wp) :: zfr1, zfr2 ! local variables
REAL(wp), DIMENSION(A2D(0)) :: zsnw ! snw distribution after wind blowing
REAL(wp), DIMENSION(A2D(0)) :: ztri
!!--------------------------------------------------------------------- !!---------------------------------------------------------------------
#if defined key_si3 #if defined key_si3
! !
...@@ -132,17 +138,28 @@ CONTAINS ...@@ -132,17 +138,28 @@ CONTAINS
emp_ice (:,:) = SUM( a_i_b(:,:,:) * evap_ice(:,:,:), dim=3 ) - sprecip(:,:) * zsnw(:,:) emp_ice (:,:) = SUM( a_i_b(:,:,:) * evap_ice(:,:,:), dim=3 ) - sprecip(:,:) * zsnw(:,:)
emp_oce (:,:) = emp_oce(:,:) - sprecip(:,:) * (1._wp - zsnw(:,:) ) emp_oce (:,:) = emp_oce(:,:) - sprecip(:,:) * (1._wp - zsnw(:,:) )
qevap_ice(:,:,:) = 0._wp qevap_ice(:,:,:) = 0._wp
qprec_ice(:,:) = rhos * ( sst_m(:,:) * rcpi - rLfus ) * tmask(:,:,1) ! in J/m3 qprec_ice(:,:) = rhos * ( sst_m(A2D(0)) * rcpi - rLfus ) * smask0(:,:) ! in J/m3
qemp_oce (:,:) = - emp_oce(:,:) * sst_m(:,:) * rcp qemp_oce (:,:) = - emp_oce(:,:) * sst_m(A2D(0)) * rcp
qemp_ice (:,:) = sprecip(:,:) * zsnw * ( sst_m(:,:) * rcpi - rLfus ) * tmask(:,:,1) ! solid precip (only) qemp_ice (:,:) = sprecip(:,:) * zsnw * ( sst_m(A2D(0)) * rcpi - rLfus ) * smask0(:,:) ! solid precip (only)
! total fluxes ! total fluxes
emp_tot (:,:) = emp_ice + emp_oce emp_tot (:,:) = emp_ice + emp_oce
qns_tot (:,:) = at_i_b(:,:) * qns_oce(:,:) + SUM( a_i_b(:,:,:) * qns_ice(:,:,:), dim=3 ) + qemp_ice(:,:) + qemp_oce(:,:) qns_tot (:,:) = at_i_b(:,:) * qns_oce(:,:) + SUM( a_i_b(:,:,:) * qns_ice(:,:,:), dim=3 ) + qemp_ice(:,:) + qemp_oce(:,:)
qsr_tot (:,:) = at_i_b(:,:) * qsr_oce(:,:) + SUM( a_i_b(:,:,:) * qsr_ice(:,:,:), dim=3 ) qsr_tot (:,:) = at_i_b(:,:) * qsr_oce(:,:) + SUM( a_i_b(:,:,:) * qsr_ice(:,:,:), dim=3 )
! --- shortwave radiation transmitted thru the surface scattering layer (W/m2) --- ! ! --- shortwave radiation transmitted below the surface (W/m2, see Grenfell Maykut 77) --- !
qtr_ice_top(:,:,:) = 0._wp cloud_fra(:,:) = pp_cldf
ztri(:,:) = 0.18 * ( 1.0 - cloud_fra(:,:) ) + 0.35 * cloud_fra(:,:) ! surface transmission when hi>10cm
!
DO jl = 1, jpl
WHERE ( phs(A2D(0),jl) <= 0._wp .AND. phi(A2D(0),jl) < 0.1_wp ) ! linear decrease from hi=0 to 10cm
qtr_ice_top(:,:,jl) = qsr_ice(:,:,jl) * ( ztri(:,:) + ( 1._wp - ztri(:,:) ) * ( 1._wp - phi(A2D(0),jl) * 10._wp ) )
ELSEWHERE( phs(A2D(0),jl) <= 0._wp .AND. phi(A2D(0),jl) >= 0.1_wp ) ! constant (ztri) when hi>10cm
qtr_ice_top(:,:,jl) = qsr_ice(:,:,jl) * ztri(:,:)
ELSEWHERE ! zero when hs>0
qtr_ice_top(:,:,jl) = 0._wp
END WHERE
ENDDO
#endif #endif
END SUBROUTINE usrdef_sbc_ice_flx END SUBROUTINE usrdef_sbc_ice_flx
......
tests/DONUT/cpp_DONUT.fcm
+ 1
− 1
View file @ 75098ec1
bld::tool::fppkeys key_si3 key_qco key_xios key_zco bld::tool::fppkeys key_si3 key_qco key_xios key_vco_1d
tests/ICE_ADV1D/MY_SRC/usrdef_zgr.F90
+ 7
− 7
View file @ 75098ec1
...@@ -32,11 +32,11 @@ MODULE usrdef_zgr ...@@ -32,11 +32,11 @@ MODULE usrdef_zgr
CONTAINS CONTAINS
SUBROUTINE usr_def_zgr( ld_zco , ld_zps , ld_sco , ld_isfcav, & ! type of vertical coordinate SUBROUTINE usr_def_zgr( ld_zco , ld_zps , ld_sco , ld_isfcav, & ! type of vertical coordinate
& k_top , k_bot , & ! top & bottom ocean level
& pdept_1d, pdepw_1d, pe3t_1d , pe3w_1d , & ! 1D reference vertical coordinate & pdept_1d, pdepw_1d, pe3t_1d , pe3w_1d , & ! 1D reference vertical coordinate
& pe3t , pe3u , pe3v , pe3f , & ! vertical scale factors
& pdept , pdepw , & ! 3D t & w-points depth & pdept , pdepw , & ! 3D t & w-points depth
& pe3t , pe3u , pe3v , pe3f , & ! vertical scale factors & pe3w , pe3uw , pe3vw ) ! vertical scale factors
& pe3w , pe3uw , pe3vw, & ! - - -
& k_top , k_bot ) ! top & bottom ocean level
!!--------------------------------------------------------------------- !!---------------------------------------------------------------------
!! *** ROUTINE usr_def_zgr *** !! *** ROUTINE usr_def_zgr ***
!! !!
...@@ -45,12 +45,12 @@ CONTAINS ...@@ -45,12 +45,12 @@ CONTAINS
!!---------------------------------------------------------------------- !!----------------------------------------------------------------------
LOGICAL , INTENT(out) :: ld_zco, ld_zps, ld_sco ! vertical coordinate flags LOGICAL , INTENT(out) :: ld_zco, ld_zps, ld_sco ! vertical coordinate flags
LOGICAL , INTENT(out) :: ld_isfcav ! under iceshelf cavity flag LOGICAL , INTENT(out) :: ld_isfcav ! under iceshelf cavity flag
INTEGER , DIMENSION(:,:) , INTENT(out) :: k_top, k_bot ! first & last ocean level
REAL(wp), DIMENSION(:) , INTENT(out) :: pdept_1d, pdepw_1d ! 1D grid-point depth [m] REAL(wp), DIMENSION(:) , INTENT(out) :: pdept_1d, pdepw_1d ! 1D grid-point depth [m]
REAL(wp), DIMENSION(:) , INTENT(out) :: pe3t_1d , pe3w_1d ! 1D grid-point depth [m] REAL(wp), DIMENSION(:) , INTENT(out) :: pe3t_1d , pe3w_1d ! 1D grid-point depth [m]
REAL(wp), DIMENSION(:,:,:), INTENT(out) :: pdept, pdepw ! grid-point depth [m] REAL(wp), DIMENSION(:,:,:), OPTIONAL, INTENT(out) :: pdept, pdepw ! grid-point depth [m]
REAL(wp), DIMENSION(:,:,:), INTENT(out) :: pe3t , pe3u , pe3v , pe3f ! vertical scale factors [m] REAL(wp), DIMENSION(:,:,:), OPTIONAL, INTENT(out) :: pe3t , pe3u , pe3v , pe3f ! vertical scale factors [m]
REAL(wp), DIMENSION(:,:,:), INTENT(out) :: pe3w , pe3uw, pe3vw ! i-scale factors REAL(wp), DIMENSION(:,:,:), OPTIONAL, INTENT(out) :: pe3w , pe3uw, pe3vw ! i-scale factors
INTEGER , DIMENSION(:,:) , INTENT(out) :: k_top, k_bot ! first & last ocean level
! !
INTEGER :: jk, k_dz ! dummy indices INTEGER :: jk, k_dz ! dummy indices
!!---------------------------------------------------------------------- !!----------------------------------------------------------------------
......
tests/ICE_ADV1D/cpp_ICE_ADV1D.fcm
+ 1
− 1
View file @ 75098ec1
bld::tool::fppkeys key_si3 key_xios key_linssh bld::tool::fppkeys key_si3 key_xios key_linssh key_vco_1d
tests/ICE_ADV2D/MY_SRC/usrdef_sbc.F90
+ 0
− 3
View file @ 75098ec1
...@@ -21,9 +21,6 @@ MODULE usrdef_sbc ...@@ -21,9 +21,6 @@ MODULE usrdef_sbc
USE ice, ONLY : jpl, at_i_b, a_i_b USE ice, ONLY : jpl, at_i_b, a_i_b
! !
USE in_out_manager ! I/O manager USE in_out_manager ! I/O manager
USE lib_mpp ! distribued memory computing library
USE lbclnk ! ocean lateral boundary conditions (or mpp link)
USE lib_fortran ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)
IMPLICIT NONE IMPLICIT NONE
PRIVATE PRIVATE
......
tests/ICE_ADV2D/MY_SRC/usrdef_zgr.F90
+ 7
− 7
View file @ 75098ec1
...@@ -32,11 +32,11 @@ MODULE usrdef_zgr ...@@ -32,11 +32,11 @@ MODULE usrdef_zgr
CONTAINS CONTAINS
SUBROUTINE usr_def_zgr( ld_zco , ld_zps , ld_sco , ld_isfcav, & ! type of vertical coordinate SUBROUTINE usr_def_zgr( ld_zco , ld_zps , ld_sco , ld_isfcav, & ! type of vertical coordinate
& k_top , k_bot , & ! top & bottom ocean level
& pdept_1d, pdepw_1d, pe3t_1d , pe3w_1d , & ! 1D reference vertical coordinate & pdept_1d, pdepw_1d, pe3t_1d , pe3w_1d , & ! 1D reference vertical coordinate
& pe3t , pe3u , pe3v , pe3f , & ! vertical scale factors
& pdept , pdepw , & ! 3D t & w-points depth & pdept , pdepw , & ! 3D t & w-points depth
& pe3t , pe3u , pe3v , pe3f , & ! vertical scale factors & pe3w , pe3uw , pe3vw ) ! vertical scale factors
& pe3w , pe3uw , pe3vw, & ! - - -
& k_top , k_bot ) ! top & bottom ocean level
!!--------------------------------------------------------------------- !!---------------------------------------------------------------------
!! *** ROUTINE usr_def_zgr *** !! *** ROUTINE usr_def_zgr ***
!! !!
...@@ -45,12 +45,12 @@ CONTAINS ...@@ -45,12 +45,12 @@ CONTAINS
!!---------------------------------------------------------------------- !!----------------------------------------------------------------------
LOGICAL , INTENT(out) :: ld_zco, ld_zps, ld_sco ! vertical coordinate flags LOGICAL , INTENT(out) :: ld_zco, ld_zps, ld_sco ! vertical coordinate flags
LOGICAL , INTENT(out) :: ld_isfcav ! under iceshelf cavity flag LOGICAL , INTENT(out) :: ld_isfcav ! under iceshelf cavity flag
INTEGER , DIMENSION(:,:) , INTENT(out) :: k_top, k_bot ! first & last ocean level
REAL(wp), DIMENSION(:) , INTENT(out) :: pdept_1d, pdepw_1d ! 1D grid-point depth [m] REAL(wp), DIMENSION(:) , INTENT(out) :: pdept_1d, pdepw_1d ! 1D grid-point depth [m]
REAL(wp), DIMENSION(:) , INTENT(out) :: pe3t_1d , pe3w_1d ! 1D grid-point depth [m] REAL(wp), DIMENSION(:) , INTENT(out) :: pe3t_1d , pe3w_1d ! 1D grid-point depth [m]
REAL(wp), DIMENSION(:,:,:), INTENT(out) :: pdept, pdepw ! grid-point depth [m] REAL(wp), DIMENSION(:,:,:), OPTIONAL, INTENT(out) :: pdept, pdepw ! grid-point depth [m]
REAL(wp), DIMENSION(:,:,:), INTENT(out) :: pe3t , pe3u , pe3v , pe3f ! vertical scale factors [m] REAL(wp), DIMENSION(:,:,:), OPTIONAL, INTENT(out) :: pe3t , pe3u , pe3v , pe3f ! vertical scale factors [m]
REAL(wp), DIMENSION(:,:,:), INTENT(out) :: pe3w , pe3uw, pe3vw ! i-scale factors REAL(wp), DIMENSION(:,:,:), OPTIONAL, INTENT(out) :: pe3w , pe3uw, pe3vw ! i-scale factors
INTEGER , DIMENSION(:,:) , INTENT(out) :: k_top, k_bot ! first & last ocean level
! !
INTEGER :: jk, k_dz ! dummy indices INTEGER :: jk, k_dz ! dummy indices
!!---------------------------------------------------------------------- !!----------------------------------------------------------------------
......
tests/ICE_ADV2D/cpp_ICE_ADV2D.fcm
+ 1
− 1
View file @ 75098ec1
bld::tool::fppkeys key_si3 key_linssh key_xios bld::tool::fppkeys key_si3 key_linssh key_xios key_vco_1d
tests/ICE_RHEO/MY_SRC/usrdef_zgr.F90
+ 8
− 8
View file @ 75098ec1
...@@ -32,11 +32,11 @@ MODULE usrdef_zgr ...@@ -32,11 +32,11 @@ MODULE usrdef_zgr
CONTAINS CONTAINS
SUBROUTINE usr_def_zgr( ld_zco , ld_zps , ld_sco , ld_isfcav, & ! type of vertical coordinate SUBROUTINE usr_def_zgr( ld_zco , ld_zps , ld_sco , ld_isfcav, & ! type of vertical coordinate
& k_top , k_bot , & ! top & bottom ocean level
& pdept_1d, pdepw_1d, pe3t_1d , pe3w_1d , & ! 1D reference vertical coordinate & pdept_1d, pdepw_1d, pe3t_1d , pe3w_1d , & ! 1D reference vertical coordinate
& pe3t , pe3u , pe3v , pe3f , & ! vertical scale factors
& pdept , pdepw , & ! 3D t & w-points depth & pdept , pdepw , & ! 3D t & w-points depth
& pe3t , pe3u , pe3v , pe3f , & ! vertical scale factors & pe3w , pe3uw , pe3vw ) ! vertical scale factors
& pe3w , pe3uw , pe3vw, & ! - - -
& k_top , k_bot ) ! top & bottom ocean level
!!--------------------------------------------------------------------- !!---------------------------------------------------------------------
!! *** ROUTINE usr_def_zgr *** !! *** ROUTINE usr_def_zgr ***
!! !!
...@@ -45,12 +45,12 @@ CONTAINS ...@@ -45,12 +45,12 @@ CONTAINS
!!---------------------------------------------------------------------- !!----------------------------------------------------------------------
LOGICAL , INTENT(out) :: ld_zco, ld_zps, ld_sco ! vertical coordinate flags LOGICAL , INTENT(out) :: ld_zco, ld_zps, ld_sco ! vertical coordinate flags
LOGICAL , INTENT(out) :: ld_isfcav ! under iceshelf cavity flag LOGICAL , INTENT(out) :: ld_isfcav ! under iceshelf cavity flag
INTEGER , DIMENSION(:,:) , INTENT(out) :: k_top, k_bot ! first & last ocean level
REAL(wp), DIMENSION(:) , INTENT(out) :: pdept_1d, pdepw_1d ! 1D grid-point depth [m] REAL(wp), DIMENSION(:) , INTENT(out) :: pdept_1d, pdepw_1d ! 1D grid-point depth [m]
REAL(wp), DIMENSION(:) , INTENT(out) :: pe3t_1d , pe3w_1d ! 1D grid-point depth [m] REAL(wp), DIMENSION(:) , INTENT(out) :: pe3t_1d , pe3w_1d ! 1D grid-point depth [m]
REAL(wp), DIMENSION(:,:,:), INTENT(out) :: pdept, pdepw ! grid-point depth [m] REAL(wp), DIMENSION(:,:,:), OPTIONAL, INTENT(out) :: pdept, pdepw ! grid-point depth [m]
REAL(wp), DIMENSION(:,:,:), INTENT(out) :: pe3t , pe3u , pe3v , pe3f ! vertical scale factors [m] REAL(wp), DIMENSION(:,:,:), OPTIONAL, INTENT(out) :: pe3t , pe3u , pe3v , pe3f ! vertical scale factors [m]
REAL(wp), DIMENSION(:,:,:), INTENT(out) :: pe3w , pe3uw, pe3vw ! i-scale factors REAL(wp), DIMENSION(:,:,:), OPTIONAL, INTENT(out) :: pe3w , pe3uw, pe3vw ! i-scale factors
INTEGER , DIMENSION(:,:) , INTENT(out) :: k_top, k_bot ! first & last ocean level
! !
INTEGER :: jk, k_dz ! dummy indices INTEGER :: jk, k_dz ! dummy indices
!!---------------------------------------------------------------------- !!----------------------------------------------------------------------
...@@ -88,7 +88,7 @@ CONTAINS ...@@ -88,7 +88,7 @@ CONTAINS
! !
! !== z-coordinate ==! (step-like topography) ! !== z-coordinate ==! (step-like topography)
! !* bottom ocean compute from the depth of grid-points ! !* bottom ocean compute from the depth of grid-points
jpkm1 = jpk !!jpkm1 = jpk
k_bot(:,:) = 1 ! here use k_top as a land mask k_bot(:,:) = 1 ! here use k_top as a land mask
! !* horizontally uniform coordinate (reference z-co everywhere) ! !* horizontally uniform coordinate (reference z-co everywhere)
DO jk = 1, jpk DO jk = 1, jpk
......
tests/ICE_RHEO/cpp_ICE_RHEO.fcm
+ 1
− 1
View file @ 75098ec1
bld::tool::fppkeys key_si3 key_linssh key_xios bld::tool::fppkeys key_si3 key_linssh key_xios key_vco_1d
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment