Commit a756649a authored by Espen Sollum's avatar Espen Sollum
Browse files

Minor modifications in dev branch

parent c56da455
./options/ ./options_test/
./output/ ./output_test/
./preprocess/flex_extract/work/ /
./AVAILABLE /xnilu_wrk/flex_wrk/WIND_FIELDS/AVAILABLE_ECMWF_OPER_fields_global
...@@ -82,6 +82,8 @@ program flexpart ...@@ -82,6 +82,8 @@ program flexpart
flexversion='Version '//trim(flexversion_major)//'.4 (2019-07-23)' flexversion='Version '//trim(flexversion_major)//'.4 (2019-07-23)'
verbosity=0 verbosity=0
write(*,*) "flexversion: ", flexversion
! Read the pathnames where input/output files are stored ! Read the pathnames where input/output files are stored
!******************************************************* !*******************************************************
......
...@@ -24,7 +24,7 @@ module com_mod ...@@ -24,7 +24,7 @@ module com_mod
! Variables defining where FLEXPART input/output files are stored ! Variables defining where FLEXPART input/output files are stored
!**************************************************************** !****************************************************************
character :: path(numpath+2*maxnests)*120 character :: path(numpath+2*maxnests)*200
integer :: length(numpath+2*maxnests) integer :: length(numpath+2*maxnests)
character(len=256) :: pathfile, flexversion, flexversion_major, arg1, arg2 character(len=256) :: pathfile, flexversion, flexversion_major, arg1, arg2
character(len=256) :: ohfields_path character(len=256) :: ohfields_path
......
...@@ -77,7 +77,7 @@ CONTAINS ...@@ -77,7 +77,7 @@ CONTAINS
! fills in attributes that can be accessed through methods in this ! fills in attributes that can be accessed through methods in this
! module ! module
USE grib_api use grib_api
IMPLICIT NONE IMPLICIT NONE
......
...@@ -72,7 +72,7 @@ subroutine gridcheck_ecmwf ...@@ -72,7 +72,7 @@ subroutine gridcheck_ecmwf
! * ! *
!********************************************************************** !**********************************************************************
use grib_api use eccodes
use par_mod use par_mod
use com_mod use com_mod
use conv_mod use conv_mod
......
...@@ -73,7 +73,7 @@ subroutine gridcheck_gfs ...@@ -73,7 +73,7 @@ subroutine gridcheck_gfs
! * ! *
!********************************************************************** !**********************************************************************
use grib_api use eccodes
use par_mod use par_mod
use com_mod use com_mod
use conv_mod use conv_mod
......
...@@ -36,7 +36,7 @@ subroutine gridcheck_nests ...@@ -36,7 +36,7 @@ subroutine gridcheck_nests
! CHANGE: 03/12/2008, Harald Sodemann, change to f90 grib_api * ! CHANGE: 03/12/2008, Harald Sodemann, change to f90 grib_api *
!***************************************************************************** !*****************************************************************************
use grib_api use eccodes
use par_mod use par_mod
use com_mod use com_mod
......
...@@ -150,14 +150,14 @@ module par_mod ...@@ -150,14 +150,14 @@ module par_mod
! ECMWF ! ECMWF
! integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92,nxshift=359 ! 1.0 degree 92 level ! integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92,nxshift=359 ! 1.0 degree 92 level
! integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138,nxshift=0 ! 1.0 degree 138 level integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138,nxshift=0 ! 1.0 degree 138 level
! integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138,nxshift=359 ! 1.0 degree 138 level ! integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138,nxshift=359 ! 1.0 degree 138 level
! integer,parameter :: nxmax=721,nymax=361,nuvzmax=138,nwzmax=138,nzmax=138,nxshift=359 ! 0.5 degree 138 level ! integer,parameter :: nxmax=721,nymax=361,nuvzmax=138,nwzmax=138,nzmax=138,nxshift=359 ! 0.5 degree 138 level
! integer,parameter :: nxmax=181,nymax=91,nuvzmax=92,nwzmax=92,nzmax=92,nxshift=0 ! CERA 2.0 degree 92 level ! integer,parameter :: nxmax=181,nymax=91,nuvzmax=92,nwzmax=92,nzmax=92,nxshift=0 ! CERA 2.0 degree 92 level
! GFS ! GFS
integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138 ! integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138
integer :: nxshift=0 ! shift not fixed for the executable ! integer :: nxshift=0 ! shift not fixed for the executable
!********************************************* !*********************************************
...@@ -222,8 +222,8 @@ module par_mod ...@@ -222,8 +222,8 @@ module par_mod
! Maximum number of particles, species, and similar ! Maximum number of particles, species, and similar
!************************************************** !**************************************************
integer,parameter :: maxpart=100000 integer,parameter :: maxpart=10000000
integer,parameter :: maxspec=1 integer,parameter :: maxspec=6
real,parameter :: minmass=0.0001 real,parameter :: minmass=0.0001
......
...@@ -65,7 +65,7 @@ subroutine readwind_ecmwf(indj,n,uuh,vvh,wwh) ...@@ -65,7 +65,7 @@ subroutine readwind_ecmwf(indj,n,uuh,vvh,wwh)
! * ! *
!********************************************************************** !**********************************************************************
use grib_api use eccodes
use par_mod use par_mod
use com_mod use com_mod
......
...@@ -64,7 +64,7 @@ subroutine readwind_gfs(indj,n,uuh,vvh,wwh) ...@@ -64,7 +64,7 @@ subroutine readwind_gfs(indj,n,uuh,vvh,wwh)
!* * !* *
!*********************************************************************** !***********************************************************************
use grib_api use eccodes
use par_mod use par_mod
use com_mod use com_mod
......
...@@ -39,7 +39,7 @@ subroutine readwind_nests(indj,n,uuhn,vvhn,wwhn) ...@@ -39,7 +39,7 @@ subroutine readwind_nests(indj,n,uuhn,vvhn,wwhn)
! CHANGE: 03/12/2008, Harald Sodemann, update to f90 with ECMWF grib_api * ! CHANGE: 03/12/2008, Harald Sodemann, update to f90 with ECMWF grib_api *
!***************************************************************************** !*****************************************************************************
use grib_api use eccodes
use par_mod use par_mod
use com_mod use com_mod
......
...@@ -111,7 +111,7 @@ subroutine timemanager(metdata_format) ...@@ -111,7 +111,7 @@ subroutine timemanager(metdata_format)
integer :: j,ks,kp,l,n,itime=0,nstop,nstop1 integer :: j,ks,kp,l,n,itime=0,nstop,nstop1
! integer :: ksp ! integer :: ksp
integer :: loutnext,loutstart,loutend integer :: loutnext,loutstart,loutend
integer :: ix,jy,ldeltat,itage,nage,idummy integer :: ix,jy,ldeltat,itage,nage,idummy,idummy2
integer :: i_nan=0,ii_nan,total_nan_intl=0 !added by mc to check instability in CBL scheme integer :: i_nan=0,ii_nan,total_nan_intl=0 !added by mc to check instability in CBL scheme
real :: outnum,weight,prob_rec(maxspec),prob(maxspec),decfact,wetscav real :: outnum,weight,prob_rec(maxspec),prob(maxspec),decfact,wetscav
! real :: uap(maxpart),ucp(maxpart),uzp(maxpart) ! real :: uap(maxpart),ucp(maxpart),uzp(maxpart)
...@@ -598,7 +598,7 @@ subroutine timemanager(metdata_format) ...@@ -598,7 +598,7 @@ subroutine timemanager(metdata_format)
if (WETBKDEP) then if (WETBKDEP) then
do ks=1,nspec do ks=1,nspec
if ((xscav_frac1(j,ks).lt.0)) then if ((xscav_frac1(j,ks).lt.0)) then
call get_wetscav(itime,lsynctime,loutnext,j,ks,grfraction,idummy,idummy,wetscav) call get_wetscav(itime,lsynctime,loutnext,j,ks,grfraction,idummy,idummy2,wetscav)
if (wetscav.gt.0) then if (wetscav.gt.0) then
xscav_frac1(j,ks)=wetscav* & xscav_frac1(j,ks)=wetscav* &
(zpoint2(npoint(j))-zpoint1(npoint(j)))*grfraction(1) (zpoint2(npoint(j))-zpoint1(npoint(j)))*grfraction(1)
......
...@@ -99,6 +99,8 @@ subroutine writeheader ...@@ -99,6 +99,8 @@ subroutine writeheader
! concentration fields ! concentration fields
!***************************************************************************** !*****************************************************************************
write(*,*) "writeheader/nspec", nspec
write(unitheader) 3*nspec,maxpointspec_act write(unitheader) 3*nspec,maxpointspec_act
do i=1,nspec do i=1,nspec
write(unitheader) 1,'WD_'//species(i)(1:7) write(unitheader) 1,'WD_'//species(i)(1:7)
......
Supports Markdown
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