Changeset 48a5c5c in flexpart.git

Timestamp:

Aug 22, 2016, 3:52:53 PM (8 years ago)

Author:

Don Morton <Don.Morton@…>

Branches:

FPv9.3.1, FPv9.3.1b_testing, FPv9.3.2, fp9.3.1-20161214-nc4, grib2nc4_repair

Children:

f155f96

Parents:

87d9684

Message:

Added in AWST mods for extensionless FP filenames and
new CTBTO message for GRIB2FLEXPART

Location:

flexpart_code

Files:

• GRIB2FLEXPART.F90 (modified) (1 diff)
• convertfields.F90 (modified) (1 diff)
• fpgridcheck.F90 (modified) (2 diffs)
• getfpfields.F90 (modified) (3 diffs)

flexpart_code/GRIB2FLEXPART.F90

@@ -57 +57 @@
   ! 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

@@ -139 +139 @@
        
           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

@@ -29 +29 @@
     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
@@ -41 +41 @@
   ! 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

@@ -120 +120 @@
            ! 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)
@@ -158 +158 @@
             ! 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)
@@ -177 +177 @@
             ! 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)