Commit e27d1231 authored by Espen Sollum's avatar Espen Sollum

Now using Vtable files in directory options/Vtables instead of run directory

parent de65cce3
......@@ -119,14 +119,16 @@ subroutine gridcheck_ecmwf
!
! Path to Vtable - current implementation assumes it's in cwd, named
! "Vtable"
CHARACTER(LEN=255), PARAMETER :: VTABLE_PATH = "Vtable"
CHARACTER(LEN=15) :: fpname ! stores FLEXPART name for curr grib mesg.
TYPE(Vtable) :: my_vtable ! unallocated
! ESO: Changed to use default Vtable file in options directory
! CHARACTER(LEN=255), PARAMETER :: VTABLE_PATH = "Vtable"
character(LEN=255) :: VTABLE_PATH
character(LEN=15) :: fpname ! stores FLEXPART name for curr grib mesg.
type(Vtable) :: my_vtable ! unallocated
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! DJM
INTEGER current_grib_level ! this was isec1(8) in previous versions
integer current_grib_level ! this was isec1(8) in previous versions
iumax=0
iwmax=0
......@@ -140,6 +142,7 @@ subroutine gridcheck_ecmwf
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!!!! Vtable code
VTABLE_PATH = path(1)(1:length(1))//'Vtables/Vtable.ecmwf'
PRINT *, 'Loading Vtable: ', VTABLE_PATH
call vtable_load_by_name(VTABLE_PATH, my_vtable)
!! Debugging tool
......
......@@ -124,13 +124,15 @@ subroutine gridcheck_gfs
!
! Path to Vtable - current implementation assumes it's in cwd, named
! "Vtable"
CHARACTER(LEN=255), PARAMETER :: VTABLE_PATH = "Vtable"
CHARACTER(LEN=15) :: fpname ! stores FLEXPART name for curr grib mesg.
TYPE(Vtable) :: my_vtable ! unallocated
! ESO: Changed to use default Vtable file in options directory
! CHARACTER(LEN=255), PARAMETER :: VTABLE_PATH = "Vtable"
character(LEN=255) :: VTABLE_PATH
character(LEN=15) :: fpname ! stores FLEXPART name for curr grib mesg.
type(Vtable) :: my_vtable ! unallocated
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! DJM
INTEGER current_grib_level ! this was isec1(8) in previous versions
integer current_grib_level ! this was isec1(8) in previous versions
......@@ -156,6 +158,7 @@ subroutine gridcheck_gfs
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!!!! Vtable code
VTABLE_PATH = path(1)(1:length(1))//'Vtables/Vtable.gfs'
PRINT *, 'Loading Vtable: ', VTABLE_PATH
call vtable_load_by_name(VTABLE_PATH, my_vtable)
!! Debugging tool
......
......@@ -85,14 +85,16 @@ subroutine gridcheck_nests
!
! Path to Vtable - current implementation assumes it's in cwd, named
! "Vtable"
CHARACTER(LEN=255), PARAMETER :: VTABLE_PATH = "Vtable"
CHARACTER(LEN=15) :: fpname ! stores FLEXPART name for curr grib mesg.
TYPE(Vtable) :: my_vtable ! unallocated
! ESO: Changed to use default Vtable file in options directory
! CHARACTER(LEN=255), PARAMETER :: VTABLE_PATH = "Vtable"
character(LEN=255) :: VTABLE_PATH
character(LEN=15) :: fpname ! stores FLEXPART name for curr grib mesg.
type(Vtable) :: my_vtable ! unallocated
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! DJM
INTEGER current_grib_level ! this was isec1(8) in previous versions
integer current_grib_level ! this was isec1(8) in previous versions
xresoln(0)=1. ! resolution enhancement for mother grid
......@@ -115,8 +117,9 @@ subroutine gridcheck_nests
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!!!! Vtable code
PRINT *, 'Loading Vtable: ', VTABLE_PATH
call vtable_load_by_name(VTABLE_PATH, my_vtable)
VTABLE_PATH = path(1)(1:length(1))//'Vtables/Vtable.ecmwf'
print *, 'Loading Vtable: ', VTABLE_PATH
call vtable_load_by_name(VTABLE_PATH, my_vtable)
!! Debugging tool
!PRINT *, 'Dump of Vtable...'
!call vtable_dump_records(my_vtable)
......
......@@ -122,14 +122,16 @@ subroutine readwind_ecmwf(indj,n,uuh,vvh,wwh)
!
! Path to Vtable - current implementation assumes it's in cwd, named
! "Vtable"
CHARACTER(LEN=255), PARAMETER :: VTABLE_PATH = "Vtable"
CHARACTER(LEN=15) :: fpname ! stores FLEXPART name for curr grib mesg.
TYPE(Vtable), save :: my_vtable ! unallocated
! ESO: Changed to use default Vtable file in options directory
! CHARACTER(LEN=255), PARAMETER :: VTABLE_PATH = "Vtable"
character(LEN=255) :: VTABLE_PATH
character(LEN=15) :: fpname ! stores FLEXPART name for curr grib mesg.
type(Vtable),save :: my_vtable ! unallocated
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! DJM
INTEGER current_grib_level ! this was isec1(8) in previous versions
integer current_grib_level ! this was isec1(8) in previous versions
logical :: linit=.true.
......@@ -149,6 +151,7 @@ subroutine readwind_ecmwf(indj,n,uuh,vvh,wwh)
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!!!! Vtable code
if (linit) then
VTABLE_PATH = path(1)(1:length(1))//'Vtables/Vtable.ecmwf'
PRINT *, 'Loading Vtable: ', VTABLE_PATH
call vtable_load_by_name(VTABLE_PATH, my_vtable)
linit=.false.
......
......@@ -124,13 +124,15 @@ subroutine readwind_gfs(indj,n,uuh,vvh,wwh)
!
! Path to Vtable - current implementation assumes it's in cwd, named
! "Vtable"
CHARACTER(LEN=255), PARAMETER :: VTABLE_PATH = "Vtable"
CHARACTER(LEN=15) :: fpname ! stores FLEXPART name for curr grib mesg.
TYPE(Vtable),save :: my_vtable ! unallocated
! ESO: Changed to use default Vtable file in options directory
! CHARACTER(LEN=255), PARAMETER :: VTABLE_PATH = "Vtable"
character(LEN=255) :: VTABLE_PATH
character(LEN=15) :: fpname ! stores FLEXPART name for curr grib mesg.
type(Vtable),save :: my_vtable ! unallocated
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! DJM
INTEGER current_grib_level ! this was isec1(8) in previous versions
integer current_grib_level ! this was isec1(8) in previous versions
logical :: linit=.true.
......@@ -145,6 +147,7 @@ subroutine readwind_gfs(indj,n,uuh,vvh,wwh)
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!!!! Vtable code
if (linit) then
VTABLE_PATH = path(1)(1:length(1))//'Vtables/Vtable.gfs'
PRINT *, 'Loading Vtable: ', VTABLE_PATH
call vtable_load_by_name(VTABLE_PATH, my_vtable)
linit=.false.
......
......@@ -95,14 +95,16 @@ subroutine readwind_nests(indj,n,uuhn,vvhn,wwhn)
!
! Path to Vtable - current implementation assumes it's in cwd, named
! "Vtable"
CHARACTER(LEN=255), PARAMETER :: VTABLE_PATH = "Vtable"
CHARACTER(LEN=15) :: fpname ! stores FLEXPART name for curr grib mesg.
! ESO: Changed to use default Vtable file in options directory
! CHARACTER(LEN=255), PARAMETER :: VTABLE_PATH = "Vtable"
character(LEN=255) :: VTABLE_PATH
character(LEN=15) :: fpname ! stores FLEXPART name for curr grib mesg.
TYPE(Vtable),save :: my_vtable ! unallocated
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! DJM
INTEGER current_grib_level ! this was isec1(8) in previous versions
integer current_grib_level ! this was isec1(8) in previous versions
logical :: linit=.true.
......@@ -125,6 +127,7 @@ subroutine readwind_nests(indj,n,uuhn,vvhn,wwhn)
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!!!! Vtable code
if (linit) then
VTABLE_PATH = path(1)(1:length(1))//'Vtables/Vtable.ecmwf'
PRINT *, 'Loading Vtable: ', VTABLE_PATH
call vtable_load_by_name(VTABLE_PATH, my_vtable)
linit=.false.
......
Markdown is supported
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