Merge branch 'adv' into nonhyd

src/2d/m2d.F90

@@ -180,7 +180,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,                       &
@@ -449,8 +448,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(zo,z,D,Dvel,DU,DV)

src/2d/variables_2d.F90

@@ -22,6 +22,7 @@
    IMPLICIT NONE
 !
 ! !PUBLIC DATA MEMBERS:
+   integer, parameter                  :: rk = kind(_ONE_)
    REALTYPE                            :: dtm
    REALTYPE,dimension(:,:),pointer     :: zo,z
    logical                             :: deformC=.false.
@@ -115,7 +116,6 @@
 !
 ! !LOCAL VARIABLES:
    integer                   :: rc
-   integer,parameter         :: rk = kind(_ONE_)
 !EOP
 !-------------------------------------------------------------------------
 !BOC
@@ -140,7 +140,7 @@
    break_stat = 0
 #endif
 
-   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_
@@ -291,7 +291,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

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

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

@@ -115,6 +115,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_3d=.false.
@@ -201,7 +202,6 @@
 !
 ! !LOCAL VARIABLES:
    integer                   :: rc
-   integer,parameter         :: rk = kind(_ONE_)
 !EOP
 !-------------------------------------------------------------------------
 !BOC
@@ -260,8 +260,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_
@@ -458,7 +458,7 @@
 !  Original author(s): Karsten Bolding & Jorn Bruggeman
 !
 ! !LOCAL VARIABLES:
-   integer,parameter :: rk = kind(_ONE_)
+!
 !EOP
 !-----------------------------------------------------------------------
 !BOC

src/3d/vertical_coordinates.F90

@@ -171,9 +171,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

src/getm/initialise.F90

@@ -275,10 +275,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)
@@ -375,6 +376,8 @@
       end if
    end if
 
+   call finalize_register_all_variables(runtype)
+
    if (.not. dryrun) then
       if (save_initial) then
       call output_manager_prepare_save(julianday, int(secondsofday), 0, int(MinN-1))

src/getm/register_all_variables.F90

@@ -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.
@@ -227,6 +233,7 @@
 #ifdef _FABM_
    call finalize_register_fabm_variables(fm)
 #endif
+   call finalize_register_processed_variables(fm)
 
    return
    end subroutine finalize_register_all_variables

src/les/les_smagorinsky_sym.F90

+#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               !
+!-----------------------------------------------------------------------

src/ncdf/ncdf_meteo.F90

@@ -148,14 +148,8 @@
                          "dimensions do not match")
       end if
       il = ilg ; jl = jlg ; ih = ihg ; jh = jhg
-   else
-      il = 1 ; jl = 1 ; ih = iextr ; jh = jextr
    end if
 
-   start(1) = il; start(2) = jl;
-   edges(1) = ih-il+1; edges(2) = jh-jl+1;
-   edges(3) = 1
-
    allocate(beta(E2DFIELD),stat=err)
    if (err /= 0) &
        stop 'init_meteo_input_ncdf: Error allocating memory (beta)'
@@ -174,6 +168,7 @@
          call to_rotated_lat_lon(southpole,olon,olat,rlon,rlat,x)
          beta = x
       end if
+      il = 1 ; jl = 1 ; ih = iextr ; jh = jextr
    else
       if (met_lat(1) .gt. met_lat(2)) then
          LEVEL3 'Reverting lat-axis and setting grid_scan to 0'
@@ -228,8 +223,21 @@
          call getm_error("init_meteo_input_ncdf()", &
                           "Some interpolation coefficients are not valid")
       end if
+
+      il = minval(gridmap(:,:,1),mask=(gridmap(:,:,1).gt.0))
+      jl = minval(gridmap(:,:,2),mask=(gridmap(:,:,2).gt.0))
+      ih = min( maxval(gridmap(:,:,1))+1 , iextr )
+      jh = min( maxval(gridmap(:,:,2))+1 , jextr )
+
+      where( gridmap(:,:,1).gt.0 ) gridmap(:,:,1) = gridmap(:,:,1) - il + 1
+      where( gridmap(:,:,2).gt.0 ) gridmap(:,:,2) = gridmap(:,:,2) - jl + 1
+
    end if
 
+   start(1) = il; start(2) = jl;
+   edges(1) = ih-il+1; edges(2) = jh-jl+1;
+   edges(3) = 1
+
    allocate(d_airp(E2DFIELD),stat=rc)
    if (rc /= 0) stop 'init_meteo_input_ncdf: Error allocating memory (d_airp)'
    d_airp = -9999*_ONE_
@@ -846,7 +854,7 @@ STDERR 'grid_north_pole_longitude ',southpole(2)
 !
 ! !LOCAL VARIABLES:
    integer         :: i,j,err
-   REALTYPE,dimension(edges(1),edges(2)) :: wrk,wrk_dp
+   REALTYPE,dimension(edges(1),edges(2)) :: wrk!,wrk_dp
    REALTYPE        :: angle,uu,vv,sinconv,cosconv
 !EOP
 !-----------------------------------------------------------------------
@@ -866,8 +874,10 @@ STDERR 'grid_north_pole_longitude ',southpole(2)
          end if
       else
          !KBKwrk_dp = _ZERO_
-         call copy_var(grid_scan,wrk,wrk_dp)
-         call do_grid_interpol(az,wrk_dp,gridmap,ti,ui,airp_input)
+         !call copy_var(grid_scan,wrk,wrk_dp)
+         !call do_grid_interpol(az,wrk_dp,gridmap,ti,ui,airp_input)
+         call flip_var(wrk)
+         call do_grid_interpol(az,wrk,gridmap,ti,ui,airp_input)
       end if
    end if
 
@@ -881,8 +891,10 @@ STDERR 'grid_north_pole_longitude ',southpole(2)
             evap_input(ill:ihl,jll:jhl) = wrk
          end if
       else
-         call copy_var(grid_scan,wrk,wrk_dp)
-         call do_grid_interpol(az,wrk_dp,gridmap,ti,ui,evap_input)
+         !call copy_var(grid_scan,wrk,wrk_dp)
+         !call do_grid_interpol(az,wrk_dp,gridmap,ti,ui,evap_input)
+         call flip_var(wrk)
+         call do_grid_interpol(az,wrk,gridmap,ti,ui,evap_input)
       end if
       if (evap_factor .ne. _ONE_) then
          evap_input = evap_input * evap_factor
@@ -899,8 +911,10 @@ STDERR 'grid_north_pole_longitude ',southpole(2)
             precip_input(ill:ihl,jll:jhl) = wrk
          end if
       else
-         call copy_var(grid_scan,wrk,wrk_dp)
-         call do_grid_interpol(az,wrk_dp,gridmap,ti,ui,precip_input)
+         !call copy_var(grid_scan,wrk,wrk_dp)
+         !call do_grid_interpol(az,wrk_dp,gridmap,ti,ui,precip_input)
+         call flip_var(wrk)
+         call do_grid_interpol(az,wrk,gridmap,ti,ui,precip_input)
       end if
       if (precip_factor .ne. _ONE_) then
          precip_input = precip_input * precip_factor
@@ -920,8 +934,10 @@ STDERR 'grid_north_pole_longitude ',southpole(2)
          end if
       else
          !KBKwrk_dp = _ZERO_
-         call copy_var(grid_scan,wrk,wrk_dp)
-         call do_grid_interpol(az,wrk_dp,gridmap,ti,ui,u10_input)
+         !call copy_var(grid_scan,wrk,wrk_dp)
+         !call do_grid_interpol(az,wrk_dp,gridmap,ti,ui,u10_input)
+         call flip_var(wrk)
+         call do_grid_interpol(az,wrk,gridmap,ti,ui,u10_input)
       end if
    end if
 
@@ -936,8 +952,10 @@ STDERR 'grid_north_pole_longitude ',southpole(2)
          end if
       else
          !KBKwrk_dp = _ZERO_
-         call copy_var(grid_scan,wrk,wrk_dp)
-         call do_grid_interpol(az,wrk_dp,gridmap,ti,ui,v10_input)
+         !call copy_var(grid_scan,wrk,wrk_dp)
+         !call do_grid_interpol(az,wrk_dp,gridmap,ti,ui,v10_input)
+         call flip_var(wrk)
+         call do_grid_interpol(az,wrk,gridmap,ti,ui,v10_input)
       end if
    end if
 
@@ -976,8 +994,10 @@ STDERR 'grid_north_pole_longitude ',southpole(2)
          end if
       else
          !KBKwrk_dp = _ZERO_
-         call copy_var(grid_scan,wrk,wrk_dp)
-         call do_grid_interpol(az,wrk_dp,gridmap,ti,ui,t2_input)
+         !call copy_var(grid_scan,wrk,wrk_dp)
+         !call do_grid_interpol(az,wrk_dp,gridmap,ti,ui,t2_input)
+         call flip_var(wrk)
+         call do_grid_interpol(az,wrk,gridmap,ti,ui,t2_input)
       end if
    end if
 
@@ -992,8 +1012,10 @@ STDERR 'grid_north_pole_longitude ',southpole(2)
          end if
       else
          !KBKwrk_dp = _ZERO_
-         call copy_var(grid_scan,wrk,wrk_dp)
-         call do_grid_interpol(az,wrk_dp,gridmap,ti,ui,hum_input)
+         !call copy_var(grid_scan,wrk,wrk_dp)
+         !call do_grid_interpol(az,wrk_dp,gridmap,ti,ui,hum_input)
+         call flip_var(wrk)
+         call do_grid_interpol(az,wrk,gridmap,ti,ui,hum_input)
       end if
    end if
 
@@ -1008,8 +1030,10 @@ STDERR 'grid_north_pole_longitude ',southpole(2)
          end if
       else
          !KBKwrk_dp = _ZERO_
-         call copy_var(grid_scan,wrk,wrk_dp)
-         call do_grid_interpol(az,wrk_dp,gridmap,ti,ui,tcc_input)
+         !call copy_var(grid_scan,wrk,wrk_dp)
+         !call do_grid_interpol(az,wrk_dp,gridmap,ti,ui,tcc_input)
+         call flip_var(wrk)
+         call do_grid_interpol(az,wrk,gridmap,ti,ui,tcc_input)
       end if
    end if
 
@@ -1064,8 +1088,10 @@ STDERR 'grid_north_pole_longitude ',southpole(2)
             sst_input(ill:ihl,jll:jhl) = wrk
          end if
       else if (calc_met) then
-         call copy_var(grid_scan,wrk,wrk_dp)
-         call do_grid_interpol(az,wrk_dp,gridmap,ti,ui,sst_input)
+         !call copy_var(grid_scan,wrk,wrk_dp)
+         !call do_grid_interpol(az,wrk_dp,gridmap,ti,ui,sst_input)
+         call flip_var(wrk)
+         call do_grid_interpol(az,wrk,gridmap,ti,ui,sst_input)
       end if
    end if
 
@@ -1079,8 +1105,10 @@ STDERR 'grid_north_pole_longitude ',southpole(2)
             sss_input(ill:ihl,jll:jhl) = wrk
          end if
       else if (calc_met) then
-         call copy_var(grid_scan,wrk,wrk_dp)
-         call do_grid_interpol(az,wrk_dp,gridmap,ti,ui,sss_input)
+         !call copy_var(grid_scan,wrk,wrk_dp)
+         !call do_grid_interpol(az,wrk_dp,gridmap,ti,ui,sss_input)
+         call flip_var(wrk)
+         call do_grid_interpol(az,wrk,gridmap,ti,ui,sss_input)
       end if
    end if
 
@@ -1094,6 +1122,35 @@ STDERR 'grid_north_pole_longitude ',southpole(2)
    end subroutine read_data
 !EOC
 
+!-----------------------------------------------------------------------
+!BOP
+!
+! !IROUTINE: flip_var -
+!
+! !INTERFACE:
+   subroutine flip_var(var)
+   IMPLICIT NONE
+!
+! !DESCRIPTION:
+!
+! !INPUT/OUTPUT PARAMETERS:
+   REALTYPE, intent(inout) :: var(edges(1),edges(2))
+!
+! !REVISION HISTORY:
+!
+! !LOCAL VARIABLES: