Changeset 5cef1eb in flexpart.git

Timestamp:

Oct 5, 2016, 10:21:23 AM (8 years ago)

Author:

Don Morton <Don.Morton@…>

Branches:

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

Children:

403dde7

Parents:

da10dc8

Message:

Modified preproc file structure so that first string is 8-byte version

See ticket ​https://www.flexpart.eu/ticket/162

Location:

flexpart_code

Files:

• .gitignore (modified) (1 diff)
• fpmetbinary_mod.F90 (modified) (5 diffs)

flexpart_code/.gitignore

@@ -3 +3 @@
 FLEXPART_GFORTRAN
 GRIB2FLEXPART_GFORTRAN
+flexpart_ifort
+grib2flexpart_ifort

flexpart_code/fpmetbinary_mod.F90

@@ -8 +8 @@
   !             Delia Arnold (deliona.arnold@gmail.com)                        *
   !                                                                            *
-  !     15 Sep 2015                                                            *
-  !                                                                            *
-  !     Currently, the only data being dumped and loaded has data structures   *
-  !     defined in com_mod.f90.  In the future, perhaps it will be necessary   *
-  !     to use data structures from other parts of the FLEXPART code system.   *
-  !                                                                            *
+  !     07 Oct 2016                                                            *
   !                                                                            *
   !     Most of the data structures from com_mod.f90 that are dumped and       *
@@ -27 +22 @@
   !     city.                                                                  *
   !                                                                            *
+  !     Recent enhancements (07 Oct 2016) DJM:                                 *
+  !                                                                            *
+  !     - file format changed so that compiled dimensions are output, and      *
+  !       during input these same dimensions are compared with the dimensions  *
+  !       compiled into the flexpart that is reading it.  A discrepancy        *
+  !       causes abort, so that time isn't wasted reading an incompatible      *
+  !       file.                                                                *
+  !                                                                            *
+  !     - file format changed so that first item is an 8-character string      *
+  !       depicting the version of the preprocessed file format.               *
+  !       An inconsistency between a detected and expected string results      *
+  !       in program abort.                                                    *
+  !                                                                            *
+  !       *** IMPORTANT *** - when the format of the preprocessed output is    *
+  !       modified in any way, be sure to change the version string below,     *
+  !       PREPROC_FORMAT_VERSION_STR, so that attempts to read the output      *
+  !       with a different format version will cause an abort.                 *
+  !                                                                            *
   !*****************************************************************************
 
@@ -39 +52 @@
     INTEGER, PARAMETER :: IOUNIT_DUMP = 33, IOUNIT_LOAD = 34, &
                           IOUNIT_TEXTOUT = 35
-    PRIVATE IOUNIT_DUMP, IOUNIT_LOAD, IOUNIT_TEXTOUT, fpio
+
+    ! When a change is made to the format of the preprocessed file, such that
+    ! this routine will not be able to read a previous version, this version
+    ! string should be modified
+    CHARACTER(LEN=8), PARAMETER :: PREPROC_FORMAT_VERSION_STR = '9.3.1e  '
+
+    PRIVATE IOUNIT_DUMP, IOUNIT_LOAD, IOUNIT_TEXTOUT, fpio,    &
+&           PREPROC_FORMAT_VERSION_STR
 
 
@@ -255 +275 @@
 &                  temp_nuvzmax, temp_nwzmax
 
+        CHARACTER(LEN=8) :: temp_preproc_format_version_str
+
         CHARACTER(LEN=128) :: errmesg
 
         if (op == 'DUMP') THEN
+
+
+            ! Write the preprocessing format version string
+            WRITE (iounit) PREPROC_FORMAT_VERSION_STR
 
             ! Write the compiled max dimensions from par_mod - these are
@@ -402 +428 @@
         ELSE IF (op == 'LOAD') THEN 
 
+            ! Read the preprocessed format version string and insure it
+            ! matches this version
+            READ (iounit) temp_preproc_format_version_str
+            PRINT *, 'Reading preprocessed file format version: ', &
+&                    temp_preproc_format_version_str
+
+            IF (TRIM(temp_preproc_format_version_str) == &
+&                                        TRIM(PREPROC_FORMAT_VERSION_STR)) THEN
+                CONTINUE
+            ELSE
+                PRINT *, ''
+                PRINT *, 'Inconsistent preprocessing format version'
+                PRINT *, 'Expected Version: ', PREPROC_FORMAT_VERSION_STR
+                PRINT *, 'Detected Version: ', temp_preproc_format_version_str
+                PRINT *, ''
+                STOP
+            END IF
+
             ! Read the compiled max dimensions that were dumped from par_mod 
             ! when creating the fp file, so that we can compare against