output: some common use of rk

src/2d/m2d.F90

@@ -131,7 +131,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,                    &
@@ -392,8 +391,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
 
       call depth_update()

src/2d/variables_2d.F90

@@ -22,6 +22,7 @@
    IMPLICIT NONE
 !
 ! !PUBLIC DATA MEMBERS:
+   integer, parameter                  :: rk = kind(_ONE_)
 #ifdef STATIC
 #include "static_2d.h"
 #else
@@ -92,7 +93,6 @@
 !
 ! !LOCAL VARIABLES:
    integer                   :: rc
-   integer,parameter         :: rk = kind(_ONE_)
 !EOP
 !-------------------------------------------------------------------------
 !BOC
@@ -115,7 +115,7 @@
    break_stat = 0
 #endif
 
-   z  = -9999*_ONE_; zo =_ZERO_
+   z  = -9999._rk ; zo =_ZERO_
 
    zub=_ZERO_ ; zub0=_ZERO_
    zvb=_ZERO_ ; zvb0=_ZERO_
@@ -170,7 +170,6 @@
 !
 ! !LOCAL VARIABLES:
    logical :: used
-   integer,parameter :: rk = kind(_ONE_)
 !EOP
 !-----------------------------------------------------------------------
 !BOC

src/3d/m3d.F90

@@ -397,8 +397,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

src/3d/salinity.F90

@@ -20,7 +20,7 @@
    use domain, only: H,az
 !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 halo_zones, only: update_3d_halo,wait_halo,D_TAG,H_TAG
    IMPLICIT NONE
 !
@@ -201,8 +201,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)

src/3d/temperature.F90

@@ -21,7 +21,7 @@
    use domain, only: ill,ihl,jll,jhl
    use domain, only: ilg,ihg,jlg,jhg
 !KB   use get_field, only: get_3d_field
-   use variables_3d, only: T,rad,hn,kmin,A,g1,g2
+   use variables_3d, only: rk,T,rad,hn,kmin,A,g1,g2
    use halo_zones, only: update_3d_halo,wait_halo,D_TAG,H_TAG
    IMPLICIT NONE
 !
@@ -279,8 +279,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)

src/3d/variables_3d.F90

@@ -116,6 +116,7 @@
    IMPLICIT NONE
 !
 ! !PUBLIC DATA MEMBERS:
+   integer, parameter                  :: rk = kind(_ONE_)
    REALTYPE                            :: dt,cnpar=0.9
    REALTYPE                            :: avmback=_ZERO_,avhback=_ZERO_
    logical                             :: do_numerical_analyses=.false.
@@ -173,7 +174,6 @@
 !
 ! !LOCAL VARIABLES:
    integer                   :: rc
-   integer,parameter         :: rk = kind(_ONE_)
 !EOP
 !-------------------------------------------------------------------------
 !BOC
@@ -219,8 +219,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 DEBUG
    write(debug,*) 'Leaving init_variables_3d()'
@@ -253,7 +253,7 @@
 !  Original author(s): Karsten Bolding & Jorn Bruggeman
 !
 ! !LOCAL VARIABLES:
-   integer,parameter :: rk = kind(_ONE_)
+!
 !EOP
 !-----------------------------------------------------------------------
 !BOC