diff --git a/flexpart_code/FLEXPART.F90 b/flexpart_code/FLEXPART.F90 index 0e85f694c1c000d7051b5a0c93b98f3a14a5b451..0f67ea756de7ba1d2cee0eb3e25469fc4db1ffbb 100644 --- a/flexpart_code/FLEXPART.F90 +++ b/flexpart_code/FLEXPART.F90 @@ -78,9 +78,9 @@ program flexpart ! Print the GPL License statement !******************************************************* #if defined CTBTO - print*,'Welcome to FLEXPART Version 9.3.1f CTBTO' + print*,'Welcome to FLEXPART Version 9.3.2 CTBTO' #else - print*,'Welcome to FLEXPART Version 9.3.1f' + print*,'Welcome to FLEXPART Version 9.3.2' #endif print*,'FLEXPART is free software released under the GNU Genera'// & diff --git a/flexpart_code/GRIB2FLEXPART.F90 b/flexpart_code/GRIB2FLEXPART.F90 index 80762670dfffe7642c0b7e1e75a9a7e23abdf622..f9be49d7cd3cc13907b8905aa4d25c986700d0e8 100644 --- a/flexpart_code/GRIB2FLEXPART.F90 +++ b/flexpart_code/GRIB2FLEXPART.F90 @@ -58,9 +58,9 @@ program grib2flexpart ! Print the GPL License statement !******************************************************* #if defined CTBTO - print*,'Welcome to GRIB2FLEXPART Version 9.3.1f CTBTO' + print*,'Welcome to GRIB2FLEXPART Version 9.3.2 CTBTO' #else - print*,'Welcome to GRIB2FLEXPART Version 9.3.1f' + print*,'Welcome to GRIB2FLEXPART Version 9.3.2' #endif print*,'FLEXPART is free software released under the GNU Genera'// & diff --git a/flexpart_code/fpmetbinary_mod.F90 b/flexpart_code/fpmetbinary_mod.F90 index df0d80124b365c652ab5a16356b91d3ac4031ac5..a5b6eec18698b779cad48a1bd763f87c482925b4 100644 --- a/flexpart_code/fpmetbinary_mod.F90 +++ b/flexpart_code/fpmetbinary_mod.F90 @@ -52,6 +52,9 @@ MODULE fpmetbinary_mod ! Users may want to change these IO Unit values if they conflict with other parts ! 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, & IOUNIT_TEXTOUT = 35 @@ -63,10 +66,14 @@ MODULE fpmetbinary_mod ! string should be modified - ! 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 + ! April 2017 (DJM) + ! 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) - 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, & & PREPROC_FORMAT_VERSION_STR @@ -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 * ! public interface to * ! this module functionality. I created the PRIVATE fpio() because I * @@ -2381,7 +2392,7 @@ PRINT *, 'OPENED NC4 FILE FOR READING...' ncret = nf90_inquire_dimension(ncid, nymaxn_dimid, nymaxn_dimname, & & temp_nymaxn) 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