Changeset 652286a in flex_extract.git for Source


Ignore:
Timestamp:
Jul 7, 2020, 4:08:49 PM (4 years ago)
Author:
Anne Philipp <anne.philipp@…>
Branches:
master, ctbto, dev
Children:
e0005c9
Parents:
98f09d2 (diff), 14d9618 (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' of ​https://www.flexpart.eu/git/flex_extract into dev
Changes due to Manuscript review for Fortran part (Petra)

Location:
Source
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • Source/Fortran/calc_etadot.f90

    rdfa7dbd rd90a529  
    486486  END IF ! MGAUSS
    487487
    488 !! CREATE FILE VERTICAL.EC NEEDED BY POP MODEL 
    489 
    490   OPEN(21,FILE='VERTICAL.EC')
    491   WRITE(21,'(A)')
    492   WRITE(21,'(A)') 'VERTICAL DISCRETIZATION OF POP MODEL'
    493   WRITE(21,'(A)')
    494   write(21,'(i3,a)') MLEVEL,'   number of layers'
    495   WRITE(21,'(A)')
    496   WRITE(21,'(A)') '* A(NLEV+1)'
    497   WRITE(21,'(A)')
    498   DO 205 I=1,MLEVEL+1
    499 205 WRITE(21,'(F18.12)') AK(I)
    500   WRITE(21,'(A)')
    501   WRITE(21,'(A)') '* B(NLEV+1)'
    502   WRITE(21,'(A)')
    503   DO 210 I=1,MLEVEL+1
    504 210 WRITE(21,'(F18.12)') BK(I)
    505   CLOSE(21)
     488! CREATE FILE VERTICAL.EC NEEDED BY POP MODEL 
     489! 2020-06-25 Commented out by PS - not needed anymore
     490
     491!  OPEN(21,FILE='VERTICAL.EC')
     492!  WRITE(21,'(A)')
     493!  WRITE(21,'(A)') 'VERTICAL DISCRETIZATION OF POP MODEL'
     494!  WRITE(21,'(A)')
     495!  write(21,'(i3,a)') MLEVEL,'   number of layers'
     496!  WRITE(21,'(A)')
     497!  WRITE(21,'(A)') '* A(NLEV+1)'
     498!  WRITE(21,'(A)')
     499!  DO 205 I=1,MLEVEL+1
     500!205 WRITE(21,'(F18.12)') AK(I)
     501!  WRITE(21,'(A)')
     502!  WRITE(21,'(A)') '* B(NLEV+1)'
     503!  WRITE(21,'(A)')
     504!  DO 210 I=1,MLEVEL+1
     505!210 WRITE(21,'(F18.12)') BK(I)
     506!  CLOSE(21)
    506507
    507508!------------------------------------------------------------------

  • Source/Fortran/makefile_debug

    r5868d74 rd2d6cf9  
    1515EXE      =  calc_etadot_debug.out
    1616
    17 ECCODES_LIB=  -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm -ljasper
     17ECCODES_LIB=  -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm
    1818EMOSLIB=-lemosR64
    1919LIB =  $(ECCODES_LIB) $(EMOSLIB)

  • Source/Fortran/makefile_fast

    r5f67883 r14d9618  
    1515EXE      =  calc_etadot_fast.out
    1616
    17 ECCODES_LIB =  -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm -ljasper
     17ECCODES_LIB =  -Bstatic -leccodes_f90 -leccodes -Bdynamic -lm
    1818EMOSLIB=-lemosR64
    1919LIB =  $(ECCODES_LIB) $(EMOSLIB)
    2020
    21 ECCODES_INCLUDE_DIR=/usr/local/include/
    22 #/usr/lib/x86_64-linux-gnu/fortran/gfortran-mod-15
     21ECCODES_INCLUDE_DIR=/usr/lib/x86_64-linux-gnu/fortran/gfortran-mod-15
     22#/usr/local/include/ #oldstable
     23
    2324INC = -I. -I$(ECCODES_INCLUDE_DIR)
    2425
    2526FC = gfortran
    26 OPT = -O3 -march=native
     27OPT = -O3 # -O3 -march=native
    2728FFLAGS =   $(OPT) $(LIB) $(INC) -fdefault-real-8 -fopenmp -fconvert=big-endian
    2829LDFLAGS =  $(OPT) $(LIB) -fopenmp

  • Source/Python/_config.py

    ra916e8f r98f09d2  
    3838# ------------------------------------------------------------------------------
    3939
    40 _VERSION_STR = '7.1.1'
     40_VERSION_STR = '7.1.2'
    4141
    4242FLAG_ON_ECMWFSERVER = 'ecgb' in platform.node()
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG