Commit fd86dea2 authored by Don Morton's avatar Don Morton
Browse files

Prepared what I hope to be a stable FPv9.3.2 for CTBTO testing

parent 1a933f23
...@@ -78,9 +78,9 @@ program flexpart ...@@ -78,9 +78,9 @@ program flexpart
! Print the GPL License statement ! Print the GPL License statement
!******************************************************* !*******************************************************
#if defined CTBTO #if defined CTBTO
print*,'Welcome to FLEXPART Version 9.3.1f CTBTO' print*,'Welcome to FLEXPART Version 9.3.2 CTBTO'
#else #else
print*,'Welcome to FLEXPART Version 9.3.1f' print*,'Welcome to FLEXPART Version 9.3.2'
#endif #endif
print*,'FLEXPART is free software released under the GNU Genera'// & print*,'FLEXPART is free software released under the GNU Genera'// &
......
...@@ -58,9 +58,9 @@ program grib2flexpart ...@@ -58,9 +58,9 @@ program grib2flexpart
! Print the GPL License statement ! Print the GPL License statement
!******************************************************* !*******************************************************
#if defined CTBTO #if defined CTBTO
print*,'Welcome to GRIB2FLEXPART Version 9.3.1f CTBTO' print*,'Welcome to GRIB2FLEXPART Version 9.3.2 CTBTO'
#else #else
print*,'Welcome to GRIB2FLEXPART Version 9.3.1f' print*,'Welcome to GRIB2FLEXPART Version 9.3.2'
#endif #endif
print*,'FLEXPART is free software released under the GNU Genera'// & print*,'FLEXPART is free software released under the GNU Genera'// &
......
...@@ -52,6 +52,9 @@ MODULE fpmetbinary_mod ...@@ -52,6 +52,9 @@ MODULE fpmetbinary_mod
! Users may want to change these IO Unit values if they conflict with other parts ! Users may want to change these IO Unit values if they conflict with other parts
! of code ! of code
! April 2017 (DJM) - These are only needed if you use the fpio_rawbin
! routines for raw binary output. The default now is NC4, but I've kept
! the old code for the time being.
INTEGER, PARAMETER :: IOUNIT_DUMP = 33, IOUNIT_LOAD = 34, & INTEGER, PARAMETER :: IOUNIT_DUMP = 33, IOUNIT_LOAD = 34, &
IOUNIT_TEXTOUT = 35 IOUNIT_TEXTOUT = 35
...@@ -63,10 +66,14 @@ MODULE fpmetbinary_mod ...@@ -63,10 +66,14 @@ MODULE fpmetbinary_mod
! string should be modified ! string should be modified
! WARNING - for now, for NC4 compatability, make sure that the PREPROC_FMT_STR_DIM ! April 2017 (DJM)
! defined above is exactly the length of the string PLUS the null character added ! WARNING - for now, for NC4 compatability, make sure that the
! PREPROC_FMT_STR_DIM
! defined above is exactly the length of the string PLUS the null
! character added
! I've had a hell of a time making it all compatible with NC4 (DJM) ! I've had a hell of a time making it all compatible with NC4 (DJM)
CHARACTER(LEN=PREPROC_FMT_STR_DIM), PARAMETER :: PREPROC_FORMAT_VERSION_STR = 'FP_p-9.3.2'//char(0) CHARACTER(LEN=PREPROC_FMT_STR_DIM), PARAMETER :: &
& PREPROC_FORMAT_VERSION_STR = 'FP_p-9.3.2'//char(0)
PRIVATE IOUNIT_DUMP, IOUNIT_LOAD, IOUNIT_TEXTOUT, fpio, & PRIVATE IOUNIT_DUMP, IOUNIT_LOAD, IOUNIT_TEXTOUT, fpio, &
& PREPROC_FORMAT_VERSION_STR & PREPROC_FORMAT_VERSION_STR
...@@ -76,6 +83,10 @@ CONTAINS ...@@ -76,6 +83,10 @@ CONTAINS
!***************************************************************************** !*****************************************************************************
! * ! *
! April 2017 (DJM) - the comment below suggesting that variables need *
! to be read in exactly the same order that they are written applies *
! only to raw binary format, not NC4. *
! *
! Subroutines fpmetbinary_dump() and fpmetbinary_load() provide the * ! Subroutines fpmetbinary_dump() and fpmetbinary_load() provide the *
! public interface to * ! public interface to *
! this module functionality. I created the PRIVATE fpio() because I * ! this module functionality. I created the PRIVATE fpio() because I *
...@@ -2381,7 +2392,7 @@ PRINT *, 'OPENED NC4 FILE FOR READING...' ...@@ -2381,7 +2392,7 @@ PRINT *, 'OPENED NC4 FILE FOR READING...'
ncret = nf90_inquire_dimension(ncid, nymaxn_dimid, nymaxn_dimname, & ncret = nf90_inquire_dimension(ncid, nymaxn_dimid, nymaxn_dimname, &
& temp_nymaxn) & temp_nymaxn)
call handle_nf90_err(ncret) call handle_nf90_err(ncret)
PRINT *, 'temp_nymaxn: ', temp_nymaxn ! PRINT *, 'temp_nymaxn: ', temp_nymaxn
! Note that maxspec_dimid and numclass_dimid were checked above ! Note that maxspec_dimid and numclass_dimid were checked above
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment