From fd86dea2732396822196778365c05ed2ef15f881 Mon Sep 17 00:00:00 2001
From: Don Morton <Don.Morton@borealscicomp.com>
Date: Fri, 28 Apr 2017 08:22:15 +0000
Subject: [PATCH] Prepared what I hope to be a stable FPv9.3.2 for CTBTO
testing
---
flexpart_code/FLEXPART.F90 | 4 ++--
flexpart_code/GRIB2FLEXPART.F90 | 4 ++--
flexpart_code/fpmetbinary_mod.F90 | 19 +++++++++++++++----
3 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/flexpart_code/FLEXPART.F90 b/flexpart_code/FLEXPART.F90
index 0e85f694..0f67ea75 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 80762670..f9be49d7 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 df0d8012..a5b6eec1 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
--
GitLab