Changeset 57a9cce in flexpart.git

Timestamp:

Oct 12, 2016, 2:06:05 PM (8 years ago)

Author:

Don Morton <Don.Morton@…>

Branches:

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

Children:

27b27d1

Parents:

e7403c8

Message:

Miscellaneous changes, discussed in flexpart.eu Ticket #163

​https://www.flexpart.eu/ticket/163

Location:

flexpart_code

Files:

• FLEXPART.F90 (modified) (1 diff)
• GRIB2FLEXPART.F90 (modified) (2 diffs)
• fpmetbinary_mod.F90 (modified) (2 diffs)
• makefile.ctbto.ifort (modified) (1 diff)
• makefile.general.ifort (modified) (1 diff)

flexpart_code/FLEXPART.F90

@@ -79 +79 @@
   !*******************************************************
 #if defined CTBTO
-  print*,'Welcome to FLEXPART Version 9.0 CTBTO'
+  print*,'Welcome to FLEXPART Version 9.3.1f CTBTO'
 #else
-  print*,'Welcome to FLEXPART Version 9.0'
+  print*,'Welcome to FLEXPART Version 9.3.1f'
 #endif
 

flexpart_code/GRIB2FLEXPART.F90

@@ -59 +59 @@
   !*******************************************************
 #if defined CTBTO
-  print*,'Welcome to GRIB2FLEXPART Version 1.0 CTBTO'
+  print*,'Welcome to GRIB2FLEXPART Version 9.3.1f CTBTO'
 #else
-  print*,'Welcome to GRIB2FLEXPART Version 1.0'
+  print*,'Welcome to GRIB2FLEXPART Version 9.3.1f'
 #endif
 
@@ -217 +217 @@
   write (current_time, *) time()
   ! generate tmp file name using PID and timestamp
-  tmp_file_name = "overwritecheck_"//trim(adjustl(pid))//"_"//trim(adjustl(current_time))//".tmp"
-  tmp_file_path = trim(dump_path)//"/"//trim(tmp_file_name)
+  !! tmp_file_name = "overwritecheck_"//trim(adjustl(pid))//"_"//trim(adjustl(current_time))//".tmp"
+  !! tmp_file_path = trim(dump_path)//"/"//trim(tmp_file_name)
 
   ! create tmp file in output directory
-  open(10001, file=trim(tmp_file_path), status="new", action="write", iostat=open_status)
+  !! open(10001, file=trim(tmp_file_path), status="new", action="write", iostat=open_status)
   ! check for tmp file
-  if ( open_status /= 0 ) then
-    print *, "Output directory does not exist or is not writeable"
-    stop 'Error: Incorrect arguments'
-  endif
+  !! if ( open_status /= 0 ) then
+  !!   print *, "Output directory does not exist or is not writeable"
+  !!   print *, "File "//trim(tmp_file_path)//", iostat=",open_status
+  !!   print *, "PID: ", pid, getpid()
+  !!   print *, "current_time: ", current_time
+
+  !!   stop 'Error: Incorrect arguments'
+  !! endif
     
   ! generate tmp file name in input directory
   if ( input_is_path == 1) then
-    check_file_path = trim(input_path)//"/"//trim(tmp_file_name)
-  else
-    check_file_path=trim(input_path(:scan(input_path, '/', .TRUE.)))//trim(tmp_file_name)
+    !! check_file_path = trim(input_path)//"/"//trim(tmp_file_name)
+    stop 'Error: Incorrect arguments; input file is path'
+  else
+    if ( scan(input_path, '/') == 0 ) then
+       check_file_path=trim(dump_path)//"/"//trim(input_path)
+    else
+       check_file_path=trim(dump_path)//trim(input_path(scan(input_path, '/', .TRUE.):))
+    endif
   endif
   !check for file presence
+  print *, "Check if output file "//trim(check_file_path)//" exists ..."
   inquire(file=TRIM(check_file_path), exist=exists)
   ! delete tmp file
-  close(10001, status='DELETE')
+  !! close(10001, status='DELETE')
   if ( exists ) then
     overwritecheck = -1
+    print *, "Warning: Output file "//trim(check_file_path)//" exists"
+    stop 'Please remove this file if the output directory is correct'
   endif
   

flexpart_code/fpmetbinary_mod.F90

@@ -56 +56 @@
     ! 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  '
+    CHARACTER(LEN=12), PARAMETER :: PREPROC_FORMAT_VERSION_STR = 'FP_p-9.3.1'//char(0)
 
     PRIVATE IOUNIT_DUMP, IOUNIT_LOAD, IOUNIT_TEXTOUT, fpio,    &
@@ -275 +275 @@
 &                  temp_nuvzmax, temp_nwzmax
 
-        CHARACTER(LEN=8) :: temp_preproc_format_version_str
+        CHARACTER(LEN=12) :: temp_preproc_format_version_str
 
         CHARACTER(LEN=128) :: errmesg

flexpart_code/makefile.ctbto.ifort

@@ -9 +9 @@
 # Set up for devlan ifort
 INTEL_ROOT = /cots/intel/composer_xe_2013.2.146
-GRIB_API_ROOT = /dvl/atm/klinkl/tmp/ifort_grib_api/grib_api-1.12.3
+GRIB_API_ROOT = /dvl/atm/klinkl/src/ifort_grib_api/grib_api-1.12.3
 
 FC       = $(INTEL_ROOT)/bin/ifort

flexpart_code/makefile.general.ifort

@@ -10 +10 @@
 # Set up for devlan ifort
 INTEL_ROOT = /cots/intel/composer_xe_2013.2.146
-GRIB_API_ROOT = /dvl/atm/klinkl/tmp/ifort_grib_api/grib_api-1.12.3
+GRIB_API_ROOT = /dvl/atm/klinkl/src/ifort_grib_api/grib_api-1.12.3
 
 FC       = $(INTEL_ROOT)/bin/ifort