Changeset fd86dea in flexpart.git


Ignore:
Timestamp:
Apr 28, 2017, 8:22:15 AM (7 years ago)
Author:
Don Morton <Don.Morton@…>
Branches:
FPv9.3.2, grib2nc4_repair
Children:
e4c6b7c
Parents:
1a933f2
Message:

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

Location:
flexpart_code
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • flexpart_code/FLEXPART.F90

    r57a9cce rfd86dea  
    7979  !*******************************************************
    8080#if defined CTBTO
    81   print*,'Welcome to FLEXPART Version 9.3.1f CTBTO'
     81  print*,'Welcome to FLEXPART Version 9.3.2 CTBTO'
    8282#else
    83   print*,'Welcome to FLEXPART Version 9.3.1f'
     83  print*,'Welcome to FLEXPART Version 9.3.2'
    8484#endif
    8585
  • flexpart_code/GRIB2FLEXPART.F90

    r57a9cce rfd86dea  
    5959  !*******************************************************
    6060#if defined CTBTO
    61   print*,'Welcome to GRIB2FLEXPART Version 9.3.1f CTBTO'
     61  print*,'Welcome to GRIB2FLEXPART Version 9.3.2 CTBTO'
    6262#else
    63   print*,'Welcome to GRIB2FLEXPART Version 9.3.1f'
     63  print*,'Welcome to GRIB2FLEXPART Version 9.3.2'
    6464#endif
    6565
  • flexpart_code/fpmetbinary_mod.F90

    rb6b9db0 rfd86dea  
    5353    ! Users may want to change these IO Unit values if they conflict with other parts
    5454    ! of code
     55    ! April 2017 (DJM) - These are only needed if you use the fpio_rawbin
     56    ! routines for raw binary output.  The default now is NC4, but I've kept
     57    ! the old code for the time being.
    5558    INTEGER, PARAMETER :: IOUNIT_DUMP = 33, IOUNIT_LOAD = 34, &
    5659                          IOUNIT_TEXTOUT = 35
     
    6467
    6568
    66     ! WARNING - for now, for NC4 compatability, make sure that the PREPROC_FMT_STR_DIM
    67     ! defined above is exactly the length of the string PLUS the null character added
     69    ! April 2017 (DJM)       
     70    ! WARNING - for now, for NC4 compatability, make sure that the
     71    ! PREPROC_FMT_STR_DIM
     72    ! defined above is exactly the length of the string PLUS the null
     73    ! character added
    6874    ! I've had a hell of a time making it all compatible with NC4 (DJM)
    69     CHARACTER(LEN=PREPROC_FMT_STR_DIM), PARAMETER :: PREPROC_FORMAT_VERSION_STR = 'FP_p-9.3.2'//char(0)
     75    CHARACTER(LEN=PREPROC_FMT_STR_DIM), PARAMETER :: &
     76&                         PREPROC_FORMAT_VERSION_STR = 'FP_p-9.3.2'//char(0)
    7077
    7178    PRIVATE IOUNIT_DUMP, IOUNIT_LOAD, IOUNIT_TEXTOUT, fpio,    &
     
    7683
    7784  !*****************************************************************************
     85  !                                                                            *
     86  !    April 2017 (DJM) - the comment below suggesting that variables need     *
     87  !         to be read in exactly the same order that they are written applies *
     88  !         only to raw binary format, not NC4.                                *
    7889  !                                                                            *
    7990  !    Subroutines fpmetbinary_dump() and fpmetbinary_load() provide the       *
     
    23822393&                                                temp_nymaxn)
    23832394            call handle_nf90_err(ncret)
    2384             PRINT *, 'temp_nymaxn: ', temp_nymaxn
     2395            ! PRINT *, 'temp_nymaxn: ', temp_nymaxn
    23852396
    23862397            ! Note that maxspec_dimid and numclass_dimid were checked above
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG