Changeset da10dc8 in flexpart.git

Timestamp:

Oct 4, 2016, 10:09:55 AM (8 years ago)

Author:

Don Morton <Don.Morton@…>

Branches:

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

Children:

5cef1eb

Parents:

e4b7087 (diff), 9cdf8bd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'fp9.3.1-fpdimcheck' into FPv9.3.1

Location:

flexpart_code

Files:

• fpmetbinary_mod.F90 (modified) (3 diffs)
• class_vtable_mod.F90 (modified) (1 diff)
• gridcheck.F90 (modified) (2 diffs)
• readwind.F90 (modified) (2 diffs)

flexpart_code/fpmetbinary_mod.F90

@@ -31 +31 @@
     USE com_mod
     USE conv_mod
+    USE par_mod, ONLY : nxmax, nymax, nzmax, nuvzmax, nwzmax
 
     IMPLICIT NONE
@@ -248 +249 @@
                                                   ! most com_mod variables.
                                                   ! Should be 1 or 2 
+
+        ! These are temporary variables, used in the LOAD option, for 
+        ! comparing against the current values in FLEXPART of nxmax, nymax, ...
+        INTEGER :: temp_nxmax, temp_nymax, temp_nzmax, &
+&                  temp_nuvzmax, temp_nwzmax
+
         CHARACTER(LEN=128) :: errmesg
 
         if (op == 'DUMP') THEN
+
+            ! Write the compiled max dimensions from par_mod - these are
+            ! not meant to be reassigned during a LOAD, but used as "header"
+            ! information to provide the structure of arrays
+            WRITE (iounit) nxmax, nymax, nzmax, nuvzmax, nwzmax
 
             ! Scalar values
@@ -390 +402 @@
         ELSE IF (op == 'LOAD') THEN 
 
+            ! Read the compiled max dimensions that were dumped from par_mod 
+            ! when creating the fp file, so that we can compare against
+            ! current FLEXPART dimensions - they need to be the same, or else
+            ! we abort.
+            READ (iounit) temp_nxmax, temp_nymax, temp_nzmax, &
+&                         temp_nuvzmax, temp_nwzmax
+
+
+            IF ( (temp_nxmax == nxmax) .AND. (temp_nymax == nymax) .AND. &
+&                   (temp_nzmax == nzmax) .AND. &
+&                   (temp_nuvzmax == nuvzmax) .AND. &
+&                   (temp_nwzmax == nwzmax) ) THEN
+                CONTINUE
+            ELSE
+                PRINT *, 'Incompatible dimensions between fp file and current FLEXPART!'
+                PRINT *, ''
+                PRINT *, '                  FP file     Compiled FP'
+                PRINT *, 'nxmax:     ', temp_nxmax, '    ', nxmax 
+                PRINT *, 'nymax:     ', temp_nymax, '    ', nymax 
+                PRINT *, 'nzmax:     ', temp_nzmax, '    ', nzmax 
+                PRINT *, 'nuvzmax:     ', temp_nuvzmax, '    ', nuvzmax 
+                PRINT *, 'nwzmax:     ', temp_nwzmax, '    ', nwzmax 
+                PRINT *, ''
+                STOP
+            END IF
+
+
             ! Scalar values
             READ(iounit) nx, ny, nxmin1, nymin1, nxfield

flexpart_code/class_vtable_mod.F90

@@ -188 +188 @@
         ! Allocate array for storing the vtable records, and store
         ! num_entries
-        print *, 'Ready to allocate the_vtable_data'
+        !print *, 'Ready to allocate the_vtable_data'
         allocate(the_vtable_data%the_entries(num_vrecs))
-        print *, 'Allocated the_vtable_data'
+        !print *, 'Allocated the_vtable_data'
         the_vtable_data%num_entries = num_vrecs
 

flexpart_code/gridcheck.F90

@@ -155 +155 @@
     !!!!!!! Vtable choice
     gribfile_name = path(3)(1:length(3))//trim(wfname(ifn))
-    print *, 'gribfile_name: ', gribfile_name
+    !print *, 'gribfile_name: ', gribfile_name
 
     gribfile_type = vtable_detect_gribfile_type( gribfile_name )
 
-    print *, 'gribfile_type: ', gribfile_type
+    !print *, 'gribfile_type: ', gribfile_type
 
     if (gribfile_type .eq. VTABLE_GRIBFILE_TYPE_ECMWF_GRIB1) then
@@ -174 +174 @@
 
     ! Load the Vtable into 'my_vtable'
-    print *, 'Loading Vtable: ', vtable_path
+    !print *, 'Loading Vtable: ', vtable_path
     call vtable_load_by_name(vtable_path, my_vtable)
-    print *, 'Vtable Initialized: ', my_vtable%initialized
-    print *, 'Vtable num_entries: ', my_vtable%num_entries
+    !print *, 'Vtable Initialized: ', my_vtable%initialized
+    !print *, 'Vtable num_entries: ', my_vtable%num_entries
     !!!!!!!!!!!!!!!!!!!  VTABLE code
     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

flexpart_code/readwind.F90

@@ -224 +224 @@
     !!!!!!! Vtable choice
     gribfile_name = path(3)(1:length(3))//trim(wfname(indj))
-    print *, 'gribfile_name: ', gribfile_name
+    !print *, 'gribfile_name: ', gribfile_name
 
     gribfile_type = vtable_detect_gribfile_type( gribfile_name )
 
-    print *, 'gribfile_type: ', gribfile_type 
+    !print *, 'gribfile_type: ', gribfile_type 
 
     if (gribfile_type .eq. VTABLE_GRIBFILE_TYPE_ECMWF_GRIB1) then
@@ -243 +243 @@
 
     ! Load the Vtable into 'my_vtable'
-    print *, 'Loading Vtable: ', vtable_path
+    !print *, 'Loading Vtable: ', vtable_path
     call vtable_load_by_name(vtable_path, my_vtable)
-    print *, 'Vtable Initialized: ', my_vtable%initialized
-    print *, 'Vtable num_entries: ', my_vtable%num_entries
+    !print *, 'Vtable Initialized: ', my_vtable%initialized
+    !print *, 'Vtable num_entries: ', my_vtable%num_entries
     !!!!!!!!!!!!!!!!!!!  VTABLE code
     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!