From 48a5c5cb5d4ff53eebd8c810ad1dd6921b30309d Mon Sep 17 00:00:00 2001
From: Don Morton <Don.Morton@borealscicomp.com>
Date: Mon, 22 Aug 2016 15:52:53 +0000
Subject: [PATCH] Added in AWST mods for extensionless FP filenames and new
CTBTO message for GRIB2FLEXPART
---
flexpart_code/GRIB2FLEXPART.F90 | 5 +++++
flexpart_code/convertfields.F90 | 4 ++--
flexpart_code/fpgridcheck.F90 | 8 ++++----
flexpart_code/getfpfields.F90 | 12 ++++++------
4 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/flexpart_code/GRIB2FLEXPART.F90 b/flexpart_code/GRIB2FLEXPART.F90
index 7e415e32..ffe784a6 100644
--- a/flexpart_code/GRIB2FLEXPART.F90
+++ b/flexpart_code/GRIB2FLEXPART.F90
@@ -56,7 +56,12 @@ program grib2flexpart
! Print the GPL License statement
!*******************************************************
+#if defined CTBTO
+ print*,'Welcome to GRIB2FLEXPART Version 1.0 CTBTO'
+#else
print*,'Welcome to GRIB2FLEXPART Version 1.0'
+#endif
+
print*,'FLEXPART is free software released under the GNU Genera'// &
'l Public License.'
diff --git a/flexpart_code/convertfields.F90 b/flexpart_code/convertfields.F90
index 8ebf35fe..04e81915 100644
--- a/flexpart_code/convertfields.F90
+++ b/flexpart_code/convertfields.F90
@@ -138,9 +138,9 @@ subroutine convertfields(ind,metdata_format,dumpPath)
filename = wfname(ind)(lastSlash+1:len(wfname(ind)))
if ( ldirect.eq.1 ) then
- fpfname = TRIM(filename) // '_fwd.fp'
+ fpfname = TRIM(filename)
else
- fpfname = TRIM(filename) // '_bwd.fp'
+ fpfname = TRIM(filename)
endif
print *, 'writing ', TRIM(dumpPath) // '/' // TRIM(fpfname)
diff --git a/flexpart_code/fpgridcheck.F90 b/flexpart_code/fpgridcheck.F90
index 171d5ce3..4247bcea 100644
--- a/flexpart_code/fpgridcheck.F90
+++ b/flexpart_code/fpgridcheck.F90
@@ -28,9 +28,9 @@ subroutine fpgridcheck
do i=1,numbwf
if ( ifn.eq.0 ) then
if ( ldirect.eq.1 ) then
- inquire(file=TRIM(path(3)) // TRIM(wfname(i)) // '_fwd.fp', exist=exists)
+ inquire(file=TRIM(path(3)) // TRIM(wfname(i)), exist=exists)
else
- inquire(file=TRIM(path(3)) // TRIM(wfname(i)) // '_bwd.fp', exist=exists)
+ inquire(file=TRIM(path(3)) // TRIM(wfname(i)), exist=exists)
endif
if ( exists ) then
ifn = i
@@ -40,9 +40,9 @@ subroutine fpgridcheck
! Create the file name and load her up
if ( ldirect.eq.1 ) then
- fpfname = TRIM(path(3)) // TRIM(wfname(ifn)) // '_fwd.fp'
+ fpfname = TRIM(path(3)) // TRIM(wfname(ifn))
else
- fpfname = TRIM(path(3)) // TRIM(wfname(ifn)) // '_bwd.fp'
+ fpfname = TRIM(path(3)) // TRIM(wfname(ifn))
endif
print *, 'fpgridcheck(): LOADING.... ', TRIM(fpfname)
diff --git a/flexpart_code/getfpfields.F90 b/flexpart_code/getfpfields.F90
index e57b7730..e53a5c00 100644
--- a/flexpart_code/getfpfields.F90
+++ b/flexpart_code/getfpfields.F90
@@ -119,9 +119,9 @@ subroutine getfpfields(itime,nstop,metdata_format)
#endif
! Read in a single .fp file, placing contents at index 2
if ( ldirect.eq.1 ) then
- fpfname = TRIM(path(3)) // TRIM(wfname(indj+1)) // '_fwd.fp'
+ fpfname = TRIM(path(3)) // TRIM(wfname(indj+1))
else
- fpfname = TRIM(path(3)) // TRIM(wfname(indj+1)) // '_bwd.fp'
+ fpfname = TRIM(path(3)) // TRIM(wfname(indj+1))
endif
print *, 'loading... ', TRIM(fpfname)
CALL fpmetbinary_load(TRIM(fpfname), memind(2))
@@ -157,9 +157,9 @@ subroutine getfpfields(itime,nstop,metdata_format)
#endif
! Read in first .fp file
if ( ldirect.eq.1 ) then
- fpfname = TRIM(path(3)) // TRIM(wfname(indj)) // '_fwd.fp'
+ fpfname = TRIM(path(3)) // TRIM(wfname(indj))
else
- fpfname = TRIM(path(3)) // TRIM(wfname(indj)) // '_bwd.fp'
+ fpfname = TRIM(path(3)) // TRIM(wfname(indj))
endif
print *, 'loading... ', TRIM(fpfname)
CALL fpmetbinary_load(TRIM(fpfname), memind(1))
@@ -176,9 +176,9 @@ subroutine getfpfields(itime,nstop,metdata_format)
#endif
! Read in second .fp file
if ( ldirect.eq.1 ) then
- fpfname = TRIM(path(3)) // TRIM(wfname(indj+1)) // '_fwd.fp'
+ fpfname = TRIM(path(3)) // TRIM(wfname(indj+1))
else
- fpfname = TRIM(path(3)) // TRIM(wfname(indj+1)) // '_bwd.fp'
+ fpfname = TRIM(path(3)) // TRIM(wfname(indj+1))
endif
print *, 'loading... ', TRIM(fpfname)
CALL fpmetbinary_load(TRIM(fpfname), memind(2))
--
GitLab