Changeset 3cd0f17 in flexpart.git


Ignore:
Timestamp:
Jun 26, 2019, 2:54:35 PM (5 years ago)
Author:
Ignacio Pisso <ip@…>
Branches:
master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug
Children:
7cebaf3
Parents:
cd62b0e (diff), 46f93d5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'dev' into release-10

Location:
src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • src/FLEXPART.f90

    r2eefa58 r8057778  
    8080  ! FLEXPART version string
    8181  flexversion_major = '10' ! Major version number, also used for species file names
    82   flexversion='Version '//trim(flexversion_major)//'.2beta (2017-08-01)'
     82  flexversion='Version '//trim(flexversion_major)//'.3 (2019-06-26)'
    8383  verbosity=0
    8484
  • src/readspecies.f90

    rcc6abaa r46f93d5  
    9999  pohnconst=2.0
    100100  pweightmolar=-999.9
     101  parea_dow=-999.9
     102  parea_hour=-999.9
     103  ppoint_dow=-999.9
     104  ppoint_hour=-999.9
     105
    101106
    102107  do j=1,24           ! initialize everything to no variation
  • src/readwind_ecmwf.f90

    r61e07ba re199b83  
    246246         (typSurf.eq.1)) then ! LSM
    247247      isec1(6)=172         ! indicatorOfParameter
     248    elseif (parNum.eq.152) then
     249      isec1(6)=152         ! avoid warning for lnsp   
    248250    else
    249251      print*,'***WARNING: undefined GRiB2 message found!',discipl, &
  • src/readwind_ecmwf_mpi.f90

    r20963b1 re199b83  
    256256         (typSurf.eq.1)) then ! LSM
    257257      isec1(6)=172         ! indicatorOfParameter
     258    elseif (parNum.eq.152) then
     259      isec1(6)=152         ! avoid warning for lnsp         
    258260    else
    259261      print*,'***WARNING: undefined GRiB2 message found!',discipl, &
  • src/readwind_nests.f90

    rdb712a8 re199b83  
    222222       (typSurf.eq.1)) then ! LSM
    223223    isec1(6)=172         ! indicatorOfParameter
     224  elseif (parNum.eq.152) then
     225      isec1(6)=152         ! avoid warning for lnsp       
    224226  else
    225227    print*,'***WARNING: undefined GRiB2 message found!',discipl, &
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG