Added in AWST mods for extensionless FP filenames and

new CTBTO message for GRIB2FLEXPART

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.'
 

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)
 

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)
 

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))