Commit c03bed1b authored by Knut's avatar Knut

Merge branch 'REAL_4B' into iow

parents 024127c9 efec9239
Pipeline #155 failed with stages
......@@ -167,7 +167,6 @@
integer :: i,j
integer :: elev_method=1
REALTYPE :: elev_const=_ZERO_
integer,parameter :: rk = kind(_ONE_)
character(LEN = PATH_MAX) :: elev_file='elev.nc'
namelist /m2d/ &
elev_method,elev_const,elev_file, &
......@@ -441,8 +440,8 @@
! This is only needed for proper flexible output
where (az .eq. 0)
z = -9999.0d0
zo = -9999.0d0
z = -9999._rk
zo = -9999._rk
end where
return
......
......@@ -23,6 +23,7 @@
IMPLICIT NONE
!
! !PUBLIC DATA MEMBERS:
integer, parameter :: rk = kind(_ONE_)
REALTYPE :: dtm
REALTYPE,dimension(:,:),pointer :: zo,z
logical :: deformC=.false.
......@@ -121,7 +122,6 @@
!
! !LOCAL VARIABLES:
integer :: rc
integer,parameter :: rk = kind(_ONE_)
!EOP
!-------------------------------------------------------------------------
!BOC
......@@ -174,12 +174,12 @@
end if
z = -9999*_ONE_; zo =_ZERO_
z = -9999._rk ; zo =_ZERO_
U = _ZERO_; DU = _ZERO_; Uint = _ZERO_; UEx = _ZERO_
V = _ZERO_; DV = _ZERO_; Vint = _ZERO_; VEx = _ZERO_
velx = -9999.0 ; vely = -9999.0
velx = -9999._rk ; vely = -9999._rk
where (az .gt. 0)
velx = _ZERO_ ; vely = _ZERO_
end where
......@@ -336,7 +336,6 @@
!
! !LOCAL VARIABLES:
logical :: used
integer,parameter :: rk = kind(_ONE_)
!EOP
!-----------------------------------------------------------------------
!BOC
......
......@@ -442,8 +442,8 @@
num(i,j,:) = 1.e-15
nuh(i,j,:) = 1.e-15
#ifndef NO_BAROCLINIC
S(i,j,:) = -9999.0
T(i,j,:) = -9999.0
S(i,j,:) = -9999._rk
T(i,j,:) = -9999._rk
#endif
end if
end do
......
......@@ -19,7 +19,7 @@
use domain, only: imin,jmin,imax,jmax,kmax,H,az,dry_z
!KB use get_field, only: get_3d_field
use variables_2d, only: fwf_int
use variables_3d, only: S,hn,kmin
use variables_3d, only: rk,S,hn,kmin
use meteo, only: metforcing,met_method,nudge_sss,sss
use meteo, only: METEO_CONST,METEO_FROMFILE,METEO_FROMEXT
use halo_zones, only: update_3d_halo,wait_halo,D_TAG,H_TAG
......@@ -308,8 +308,8 @@
stop 'init_salinity'
end select
S(:,:,0) = -9999*_ONE_
forall(i=imin:imax,j=jmin:jmax, az(i,j).eq.0) S(i,j,:) = -9999*_ONE_
S(:,:,0) = -9999._rk
forall(i=imin:imax,j=jmin:jmax, az(i,j).eq.0) S(i,j,:) = -9999._rk
call update_3d_halo(S,S,az,imin,jmin,imax,jmax,kmax,D_TAG)
call wait_halo(D_TAG)
......
......@@ -20,7 +20,7 @@
use domain, only: imin,jmin,imax,kmax,jmax,H,az,dry_z
use domain, only: ill,ihl,jll,jhl
use domain, only: ilg,ihg,jlg,jhg
use variables_3d, only: T,rad,hn,kmin,A,g1,g2,heatflux_net
use variables_3d, only: rk,T,rad,hn,kmin,A,g1,g2,heatflux_net
use meteo, only: metforcing,met_method,nudge_sst,sst
use meteo, only: METEO_CONST,METEO_FROMFILE,METEO_FROMEXT
!KB use get_field, only: get_3d_field
......@@ -386,8 +386,8 @@ end interface
stop 'init_temperature'
end select
T(:,:,0) = -9999*_ONE_
forall(i=imin:imax,j=jmin:jmax, az(i,j).eq.0) T(i,j,:) = -9999*_ONE_
T(:,:,0) = -9999._rk
forall(i=imin:imax,j=jmin:jmax, az(i,j).eq.0) T(i,j,:) = -9999._rk
call update_3d_halo(T,T,az,imin,jmin,imax,jmax,kmax,D_TAG)
call wait_halo(D_TAG)
......
......@@ -117,6 +117,7 @@
IMPLICIT NONE
!
! !PUBLIC DATA MEMBERS:
integer, parameter :: rk = kind(_ONE_)
REALTYPE :: dt,cnpar=0.9
REALTYPE :: avmback=_ZERO_,avhback=_ZERO_
logical :: save_Sfluxu=.false.
......@@ -220,7 +221,6 @@
!
! !LOCAL VARIABLES:
integer :: i,j, rc
integer,parameter :: rk = kind(_ONE_)
!EOP
!-------------------------------------------------------------------------
!BOC
......@@ -322,8 +322,8 @@
#endif
! must be nonzero for gotm_fabm in case of calc_temp=F
g1 = -9999*_ONE_
g2 = -9999*_ONE_
g1 = -9999._rk
g2 = -9999._rk
#ifdef STRUCTURE_FRICTION
sf = _ZERO_
......@@ -536,7 +536,7 @@
! Original author(s): Karsten Bolding & Jorn Bruggeman
!
! !LOCAL VARIABLES:
integer,parameter :: rk = kind(_ONE_)
!
!EOP
!-----------------------------------------------------------------------
!BOC
......
......@@ -183,9 +183,9 @@ stop
! calculate the z-coordinate of the cell centers
! references to mean sea level
zc(:,:,0)=-H(:,:)
zc(:,:,1)=-H(:,:) + 0.5*hn(:,:,1)
zc(:,:,1)=-H(:,:) + _HALF_*hn(:,:,1)
do k=2,kmax
zc(:,:,k)=zc(:,:,k-1)+0.5*(hn(:,:,k-1)+hn(:,:,k))
zc(:,:,k)=zc(:,:,k-1)+_HALF_*(hn(:,:,k-1)+hn(:,:,k))
end do
#ifdef SLICE_MODEL
......
......@@ -1294,12 +1294,7 @@
! staggerAlign and staggerEdgeWidth's.
! internal call to ESMF_GridCreateFrmDistGrid()
getmGrid2D = ESMF_GridCreate(getmDistGrid2D,name=trim(name)//"Grid2D", &
#if 0
! bug in ESMF
gridAlign=(/1,1/), &
#else
gridEdgeLWidth=(/1,1/), &
#endif
coordSys=coordSys, &
coordDimCount=int(coordDimCount(1:2)), &
coordDimMap=int(coordDimMap(1:2,1:2)), &
......@@ -1308,13 +1303,7 @@
if (abort) call ESMF_Finalize(endflag=ESMF_END_ABORT)
getmGrid3D = ESMF_GridCreate(getmDistGrid3D,name=trim(name)//"Grid3D", &
#if 0
! bug in ESMF
gridAlign=(/1,1,1/), &
#else
gridEdgeLWidth=(/1,1,1/), &
#endif
coordSys=coordSys, &
coordDimCount=coordDimCount, &
coordDimMap=coordDimMap, &
......@@ -2979,8 +2968,6 @@ if (abort) call ESMF_Finalize(endflag=ESMF_END_ABORT)
xxArray2D = ESMF_ArrayCreate(distgrid,xx1D, &
indexflag=ESMF_INDEX_DELOCAL, &
! totalLWidth=(/HALO+1/), &
totalUWidth=(/HALO /), &
rc=rc)
abort = ESMF_LogFoundError(rc,line=__LINE__,file=FILENAME)
if (abort) call ESMF_Finalize(endflag=ESMF_END_ABORT)
......@@ -2988,8 +2975,6 @@ if (abort) call ESMF_Finalize(endflag=ESMF_END_ABORT)
yxArray2D = ESMF_ArrayCreate(distgrid,yx1D, &
indexflag=ESMF_INDEX_DELOCAL, &
distgridToArrayMap=(/0,1/), &
! totalLWidth=(/HALO+1/), &
totalUWidth=(/HALO /), &
rc=rc)
abort = ESMF_LogFoundError(rc,line=__LINE__,file=FILENAME)
if (abort) call ESMF_Finalize(endflag=ESMF_END_ABORT)
......@@ -3022,8 +3007,6 @@ if (abort) call ESMF_Finalize(endflag=ESMF_END_ABORT)
xxArray3D = ESMF_ArrayCreate(distgrid,xx1D, &
indexflag=ESMF_INDEX_DELOCAL, &
! totalLWidth=(/HALO+1/), &
totalUWidth=(/HALO /), &
rc=rc)
abort = ESMF_LogFoundError(rc,line=__LINE__,file=FILENAME)
if (abort) call ESMF_Finalize(endflag=ESMF_END_ABORT)
......@@ -3031,8 +3014,6 @@ if (abort) call ESMF_Finalize(endflag=ESMF_END_ABORT)
yxArray3D = ESMF_ArrayCreate(distgrid,yx1D, &
indexflag=ESMF_INDEX_DELOCAL, &
distgridToArrayMap=(/0,1,0/), &
! totalLWidth=(/HALO+1/), &
totalUWidth=(/HALO /), &
rc=rc)
abort = ESMF_LogFoundError(rc,line=__LINE__,file=FILENAME)
if (abort) call ESMF_Finalize(endflag=ESMF_END_ABORT)
......@@ -3124,16 +3105,12 @@ if (abort) call ESMF_Finalize(endflag=ESMF_END_ABORT)
xxArray2D = ESMF_ArrayCreate(distgrid,xx2D, &
indexflag=ESMF_INDEX_DELOCAL, &
! totalLWidth=(/HALO+1,HALO+1/), &
totalUWidth=(/HALO ,HALO /), &
rc=rc)
abort = ESMF_LogFoundError(rc,line=__LINE__,file=FILENAME)
if (abort) call ESMF_Finalize(endflag=ESMF_END_ABORT)
yxArray2D = ESMF_ArrayCreate(distgrid,yx2D, &
indexflag=ESMF_INDEX_DELOCAL, &
! totalLWidth=(/HALO+1,HALO+1/), &
totalUWidth=(/HALO ,HALO /), &
rc=rc)
abort = ESMF_LogFoundError(rc,line=__LINE__,file=FILENAME)
if (abort) call ESMF_Finalize(endflag=ESMF_END_ABORT)
......@@ -3165,16 +3142,12 @@ if (abort) call ESMF_Finalize(endflag=ESMF_END_ABORT)
xxArray3D = ESMF_ArrayCreate(distgrid,xx2D, &
indexflag=ESMF_INDEX_DELOCAL, &
! totalLWidth=(/HALO+1,HALO+1/), &
totalUWidth=(/HALO ,HALO /), &
rc=rc)
abort = ESMF_LogFoundError(rc,line=__LINE__,file=FILENAME)
if (abort) call ESMF_Finalize(endflag=ESMF_END_ABORT)
yxArray3D = ESMF_ArrayCreate(distgrid,yx2D, &
indexflag=ESMF_INDEX_DELOCAL, &
! totalLWidth=(/HALO+1,HALO+1/), &
totalUWidth=(/HALO ,HALO /), &
rc=rc)
abort = ESMF_LogFoundError(rc,line=__LINE__,file=FILENAME)
if (abort) call ESMF_Finalize(endflag=ESMF_END_ABORT)
......
......@@ -360,10 +360,11 @@
#endif
end if
#endif
call init_output_processing()
call init_les(runtype)
call init_output_processing()
call init_register_all_variables(runtype)
allocate(type_getm_host::output_manager_host)
......
......@@ -11,6 +11,12 @@
!
! !USES:
use field_manager
use variables_2d, only: register_2d_variables
use variables_3d, only: register_3d_variables
#ifdef _FABM_
use getm_fabm, only: register_fabm_variables
#endif
use output_processing, only: register_processed_variables, finalize_register_processed_variables
IMPLICIT NONE
!
! default: all is private.
......@@ -229,6 +235,7 @@
#ifdef _FABM_
call finalize_register_fabm_variables(fm)
#endif
call finalize_register_processed_variables(fm)
return
end subroutine finalize_register_all_variables
......
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
!
! !ROUTINE: les_smagorinsky_sym - \label{les_smagorinsky_sym}
!
! !INTERFACE:
subroutine les_smagorinsky_sym(dudxC,dudxV, &
#ifndef SLICE_MODEL
dvdyC,dvdyU, &
#endif
shearX,shearU, &
AmC,AmX,AmU,AmV)
! Note (KK): keep in sync with interface in les.F90
!
! !DESCRIPTION:
!
!
! !USES:
use variables_les, only: SmagC2_2d,SmagX2_2d,SmagU2_2d,SmagV2_2d
use domain, only: imin,imax,jmin,jmax,az,ax,au,av
use domain, only: dxc,dyc,dxx,dyx,dxu,dyu,dxv,dyv
use getm_timers, only: tic,toc,TIM_SMAG2D
!$ use omp_lib
IMPLICIT NONE
!
! !INPUT PARAMETERS:
REALTYPE,dimension(E2DFIELD),intent(in) :: dudxC,dudxV
#ifndef SLICE_MODEL
REALTYPE,dimension(E2DFIELD),intent(in) :: dvdyC,dvdyU
#endif
REALTYPE,dimension(E2DFIELD),intent(in) :: shearX,shearU
!
! !OUTPUT PARAMETERS:
REALTYPE,dimension(E2DFIELD),intent(out),optional :: AmC,AmX,AmU,AmV
!
! !REVISION HISTORY:
! Original author(s): Knut Klingbeil
!
! !LOCAL VARIABLES:
REALTYPE :: dudx,dvdy
integer :: i,j
!EOP
!-----------------------------------------------------------------------
!BOC
#ifdef DEBUG
integer, save :: Ncall = 0
Ncall = Ncall+1
write(debug,*) 'les_smagorinsky_sym() # ',Ncall
#endif
#ifdef SLICE_MODEL
j = jmax/2 ! this MUST NOT be changed!!!
#endif
call tic(TIM_SMAG2D)
!$OMP PARALLEL DEFAULT(SHARED) &
!$OMP FIRSTPRIVATE(j) &
!$OMP PRIVATE(i,dudx,dvdy)
if (present(AmC)) then
!$OMP DO SCHEDULE(RUNTIME)
#ifndef SLICE_MODEL
do j=jmin-1,jmax+1
#endif
do i=imin-1,imax+1
! Note (KK): AmC(az=1) needed in uv_diffusion
if (az(i,j) .eq. 1) then
! interpolate shearC
! Note (KK): in W/E open boundary cells shearC(az=2) would
! require shearU outside open boundary
! in N/S open boundary cells shearC(az=2) would
! require shearU(au=3)
! however shearC(az=2) not needed
AmC(i,j) = ( &
dudxC(i,j) &
#ifndef SLICE_MODEL
- dvdyC(i,j) &
#endif
)**2 &
+ (_HALF_*(shearU(i-1,j) + shearU(i,j)))**2
AmC(i,j) = SmagC2_2d(i,j)*DXC*DYC*sqrt(AmC(i,j))
end if
end do
#ifndef SLICE_MODEL
end do
#endif
!$OMP END DO NOWAIT
#ifdef SLICE_MODEL
!$OMP BARRIER
!$OMP SINGLE
AmC(imin-1:imax+1,j+1) = AmC(imin-1:imax+1,j)
!$OMP END SINGLE
#endif
end if
if (present(AmX)) then
!$OMP DO SCHEDULE(RUNTIME)
#ifndef SLICE_MODEL
do j=jmin-1,jmax
#endif
do i=imin-1,imax
if (ax(i,j) .eq. 1) then
! interpolate dudxX and dvdyX
if (av(i,j).eq.3 .or. av(i+1,j).eq.3) then
! Note (KK): western/eastern open bdy
dudx = _ZERO_
else
dudx = _HALF_*(dudxV(i,j) + dudxV(i+1,j ))
end if
#ifndef SLICE_MODEL
if (au(i,j).eq.3 .or. au(i,j+1).eq.3) then
! Note (KK): northern/southern open bdy
dvdy = _ZERO_
else
dvdy = _HALF_*(dvdyU(i,j) + dvdyU(i ,j+1))
end if
#endif
AmX(i,j) = ( &
dudx &
#ifndef SLICE_MODEL
- dvdy &
#endif
)**2 &
+ shearX(i,j)**2
AmX(i,j) = SmagX2_2d(i,j)*DXX*DYX*sqrt(AmX(i,j))
end if
end do
#ifndef SLICE_MODEL
end do
#endif
!$OMP END DO NOWAIT
#ifdef SLICE_MODEL
!$OMP BARRIER
!$OMP SINGLE
AmX(imin-1:imax,j-1) = AmX(imin-1:imax,j)
AmX(imin-1:imax,j+1) = AmX(imin-1:imax,j)
!$OMP END SINGLE
#endif
end if
if (present(AmU)) then
!$OMP DO SCHEDULE(RUNTIME)
#ifndef SLICE_MODEL
do j=jmin-1,jmax+1
#endif
do i=imin-1,imax
! Note (KK): shearU(au=3) not available
! (however we only need AmU(au=[1|2]) in tracer_diffusion)
if(au(i,j).eq.1 .or. au(i,j).eq.2) then
! interpolate dudxU (see deformation_rates)
if (au(i,j) .eq. 1) then
dudx = _HALF_*(dudxC(i,j) + dudxC(i+1,j))
else
dudx = _ZERO_
end if
AmU(i,j) = ( &
dudx &
#ifndef SLICE_MODEL
- dvdyU(i,j) &
#endif
)**2 &
+ shearU(i,j)**2
AmU(i,j) = SmagU2_2d(i,j)*DXU*DYU*sqrt(AmU(i,j))
end if
end do
#ifndef SLICE_MODEL
end do
#endif
!$OMP END DO NOWAIT
#ifdef SLICE_MODEL
!$OMP BARRIER
!$OMP SINGLE
AmU(imin-1:imax,j+1) = AmU(imin-1:imax,j)
!$OMP END SINGLE
#endif
end if
#ifndef SLICE_MODEL
if (present(AmV)) then
!$OMP DO SCHEDULE(RUNTIME)
do j=jmin-1,jmax
do i=imin-1,imax+1
! Note (KK): we only need AmV(av=[1|2]) in tracer_diffusion
! (shearV(av=3) cannot be calculated anyway)
if(av(i,j).eq.1 .or. av(i,j).eq.2) then
! interpolate dvdyV and shearV (see deformation_rates)
if (av(i,j) .eq. 1) then
dvdy = _HALF_*(dvdyC(i,j) + dvdyC(i,j+1))
else
dvdy = _ZERO_
end if
AmV(i,j) = ( &
dudxV(i,j) &
- dvdy &
)**2 &
+ (_HALF_*(shearX(i-1,j) + shearX(i,j)))**2
AmV(i,j) = SmagV2_2d(i,j)*DXV*DYV*sqrt(AmV(i,j))
end if
end do
end do
!$OMP END DO NOWAIT
end if
#endif
!$OMP END PARALLEL
call toc(TIM_SMAG2D)
#ifdef DEBUG
write(debug,*) 'Leaving les_smagorinsky_sym()'
write(debug,*)
#endif
return
end subroutine les_smagorinsky_sym
!EOC
!-----------------------------------------------------------------------
! Copyright (C) 2011 - Hans Burchard and Karsten Bolding !
!-----------------------------------------------------------------------
......@@ -18,18 +18,22 @@
private
!
! !PUBLIC DATA FUNCTIONS:
public init_output_processing, register_processed_variables, do_output_processing
public init_output_processing, do_output_processing
public register_processed_variables, finalize_register_processed_variables
!
! !PUBLIC DATA MEMBERS:
!
! !PRIVATE DATA MEMBERS:
REALTYPE, dimension(:,:), allocatable, target :: u2d, v2d
REALTYPE, dimension(:,:), allocatable, target :: u2d_destag, v2d_destag
REALTYPE, dimension(:,:,:), allocatable, target :: u3d, v3d
REALTYPE, dimension(:,:), allocatable, target :: u2d_destag, v2d_destag
REALTYPE, dimension(:,:,:), allocatable, target :: u3d_destag, v3d_destag
!
! !PRIVATE DATA MEMBERS:
logical, target:: u2d_use, v2d_use
logical :: u2d_used, v2d_used
logical :: u3d_used, v3d_used
logical, target :: u2d_now, v2d_now
logical, target :: u3d_now, v3d_now
logical, target:: u2d_destag_use, v2d_destag_use
logical, target:: u3d_use, v3d_use
logical, target:: u3d_destag_use, v3d_destag_use
integer, parameter :: rk = kind(_ONE_)
!
......@@ -65,12 +69,7 @@
!EOP
!-------------------------------------------------------------------------
!BOC
allocate(u2d(E2DFIELD),stat=rc)
if (rc /= 0) stop 'init_output_processing: Error allocating memory (u2d)'
u2d = 0._rk
allocate(v2d(E2DFIELD),stat=rc)
if (rc /= 0) stop 'init_output_processing: Error allocating memory (v2d)'
v2d = 0._rk
allocate(u2d_destag(E2DFIELD),stat=rc)
if (rc /= 0) stop 'init_output_processing: Error allocating memory (u2d_destag)'
u2d_destag = 0._rk
......@@ -79,10 +78,6 @@
v2d_destag = 0._rk
#if 0
allocate(u3d(I3DFIELD),stat=rc)
if (rc /= 0) stop 'init_output_processing: Error allocating memory (u3d)'
allocate(v3d(I3DFIELD),stat=rc)
if (rc /= 0) stop 'init_output_processing: Error allocating memory (v3d)'
allocate(u3d_destag(I3DFIELD),stat=rc)
if (rc /= 0) stop 'init_output_processing: Error allocating memory (u3d_destag)'
allocate(v3d_destag(I3DFIELD),stat=rc)
......@@ -117,8 +112,15 @@
!BOC
LEVEL2 'register_processed_variables()'
call fm%register('u2d', 'm/s', 'velocity in local x-direction', standard_name='', data2d=u2d(_2D_W_), fill_value=-9999._rk, category='velocities', used_now=u2d_use)
call fm%register('v2d', 'm/s', 'velocity in local y-direction', standard_name='', data2d=v2d(_2D_W_), fill_value=-9999._rk, category='velocities', used_now=v2d_use)
call fm%register('u2d', 'm/s', 'velocity in local x-direction', standard_name='', fill_value=-9999._rk, category='velocities', output_level=output_level_debug, used=u2d_used, used_now=u2d_now)
call fm%register('v2d', 'm/s', 'velocity in local y-direction', standard_name='', fill_value=-9999._rk, category='velocities', output_level=output_level_debug, used=v2d_used, used_now=v2d_now)
#ifndef NO_3D
call fm%register('u3d', 'm/s', 'velocity in local x-direction (3D)', standard_name='', dimensions=(/id_dim_z/), fill_value=-9999._rk, category='velocities', output_level=output_level_debug, used=u3d_used, used_now=u3d_now)
call fm%register('v3d', 'm/s', 'velocity in local y-direction (3D)', standard_name='', dimensions=(/id_dim_z/), fill_value=-9999._rk, category='velocities', output_level=output_level_debug, used=v3d_used, used_now=v3d_now)
#endif
call fm%register('u2d-destag', 'm/s', 'velocity in local x-direction(destag)', standard_name='', data2d=u2d_destag(_2D_W_), fill_value=-9999._rk, category='velocities',output_level=output_level_debug, used_now=u2d_destag_use)
call fm%register('v2d-destag', 'm/s', 'velocity in local y-direction(destag)', standard_name='', data2d=v2d_destag(_2D_W_), fill_value=-9999._rk, category='velocities',output_level=output_level_debug, used_now=v2d_destag_use)
......@@ -126,6 +128,67 @@
end subroutine register_processed_variables
!EOC<