Changeset 652286a in flex_extract.git


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)

Files:
2 added
10 edited
1 moved

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

  • Testing/Regression/FortranEtadot/run_ref.sh

    r6bc4b42 r14d9618  
    1414exefast=calc_etadot_fast.out
    1515hash=$(git log --abbrev-commit --pretty=oneline -n 1  --pretty=format:'%h')
     16csvfile='runtimes_'${HOST}'.csv'
    1617exitonfail=true
    1718rm -f log.run_ref failed
    … …  
    1920# loop over all reference runs
    2021rm -f log.run_ref
     22rm -f Work/*
    2123
    2224if [ "$1" = omithigh ]; then # for fast testing, not for production
    … …  
    5153      if [ "${exitonfail}" = true ]; then exit; fi
    5254    fi
    53     for outfile in 'fort.15' 'VERTICAL.EC'; do
     55    for outfile in 'fort.15' ; do
    5456      if [ -e $outfile ]; then
    5557        mv ${outfile} ../${outdir}
    … …  
    6870  # compare debug and fast
    6971  # omega case also produces fort.25 - need to add this
    70   for outfile in 'fort.15' 'VERTICAL.EC'; do
     72  for outfile in 'fort.15' ; do
    7173    outdebug='Outputs/Output_ref_'${ref}'_debug/'$outfile
    7274    outfast='Outputs/Output_ref_'${ref}'_fast/'$outfile
    73     test=$(cmp  $outdebug $outfast)
    74     if $test; then
     75    test=$()
     76    if cmp -s $outdebug $outfast >/dev/null; then
    7577      echo $outfile '    equal for debug and fast' >> log.run_ref
    7678    else
    … …  
    8890    user=$(echo $times | grep user | awk '{print $4}')
    8991    sys=$( echo $times | grep sys  | awk '{print $6}')
    90     echo $hash, "'"reference"'", "'"${ref}'_'${exe}"'", ${real}, ${user}, ${sys} >> runtimes.csv
     92    echo $hash, "'"reference"'", "'"${ref}'_'${exe}"'", ${real}, ${user}, ${sys} >> ${csvfile}
    9193    tail -1 runtimes.csv >> log.run_ref
    9294  done

  • Testing/Regression/FortranEtadot/run_regrtest.sh

    rdfa7dbd r14d9618  
    1717exefast=calc_etadot_fast.out
    1818hash=$(git log --abbrev-commit --pretty=oneline -n 1  --pretty=format:'%h')
     19csvfile='runtimes_'${HOST}'.csv'
    1920exitonfail=true
    2021numtest=0
    … …  
    3233for ref in $inputs; do
    3334
    34   echo 'Working on test case =' $ref
     35  echo 'Working on test case =' $ref | tee -a ../log.run_regr
    3536
    3637  # loop over debug and fast runs
    … …  
    6263        # omega case also produces fort.25 - need to add this
    6364        outref='../Outputs/Output_ref_'${ref}'_'${exe}'/'$outfile
    64         test=$(cmp  $outfile $outref)
    65         if $test; then
     65        if cmp -s $outfile $outref >/dev/null; then
    6666          echo '    '$outfile '    test passed' | tee -a ../log.run_regr
    6767        else
    … …  
    8585    user=$(echo $times | grep user | awk '{print $4}')
    8686    sys=$( echo $times | grep sys  | awk '{print $6}')
    87     echo $hash, "'"reference"'", "'"${ref}'_'${exe}"'", ${real}, ${user}, ${sys} >> ../runtimes.csv
    88     tail -1 ../runtimes.csv >> log.run_regr
     87    echo $hash, "'"reference"'", "'"${ref}'_'${exe}"'", ${real}, ${user}, ${sys} >> ../${csvfile}
     88    tail -1 ../${csvfile} >> log.run_regr
    8989
    9090    cd ..
    91     rm Work/* # this is for being more safe
     91    rm -f Work/* # this is for being more safe
    9292
    9393  done # end of exe loop
    … …  
    100100  | tee -a ../log.run_regr
    101101echo ' More information may be found in log.run_regr'
    102 echo ' Runtimes were added to runtimes.csv under '$hash | tee -a ../log.run_regr
     102echo ' Runtimes were added to '${csvfile}' under '$hash | tee -a ../log.run_regr
    103103
    104104# the following code is executed only if exitonfail is not set to 'true'.

  • Testing/Regression/FortranEtadot/runtimes_imp7.csv

    r2d1c338 r14d9618  
    1515949379e, 'reference', 'latlonall_debug', 0m0.777s, 0m6.772s, 0m0.620s
    1616949379e, 'reference', 'latlonall_fast', 0m0.687s, 0m7.064s, 0m0.196s
     17d90a529, 'reference', 'etadot_debug', 0m0.504s, 0m0.431s, 0m0.016s
     18d90a529, 'reference', 'etadot_fast', 0m0.442s, 0m0.529s, 0m0.017s
     19d90a529, 'reference', 'etadotall_debug', 0m0.576s, 0m0.603s, 0m0.048s
     20d90a529, 'reference', 'etadotall_fast', 0m0.604s, 0m0.673s, 0m0.028s
     21d90a529, 'reference', 'etadothigh_debug', 17m14.011s, 16m31.983s, 0m18.441s
     22d90a529, 'reference', 'etadothigh_fast', 17m23.426s, 16m31.624s, 0m21.645s
     23d90a529, 'reference', 'gauss_debug', 0m3.348s, 0m7.130s, 0m0.208s
     24d90a529, 'reference', 'gauss_fast', 0m2.403s, 0m5.028s, 0m0.156s
     25d90a529, 'reference', 'gaussall_debug', 0m12.126s, 0m28.251s, 0m0.648s
     26d90a529, 'reference', 'gaussall_fast', 0m9.868s, 0m23.323s, 0m0.880s
     27d90a529, 'reference', 'gausshigh_debug', 5m4.089s, 14m23.018s, 0m12.998s
     28d90a529, 'reference', 'gausshigh_fast', 4m48.049s, 13m11.227s, 0m16.318s
     29d90a529, 'reference', 'latlon_debug', 0m0.657s, 0m0.681s, 0m0.016s
     30d90a529, 'reference', 'latlon_fast', 0m0.485s, 0m0.563s, 0m0.004s
     31d90a529, 'reference', 'latlonall_debug', 0m0.544s, 0m0.613s, 0m0.012s
     32d90a529, 'reference', 'latlonall_fast', 0m0.534s, 0m0.620s, 0m0.020s

  • .gitignore

    r072cbea r98f09d2  
    1010#
    1111# @Licence:
    12 #    (C) Copyright 2014-2019.
     12#    (C) Copyright 2014-2020.
    1313#
    1414#    SPDX-License-Identifier: CC-BY-4.0
    … …  
    3030Run/Workspace/*
    3131Run/Jobscripts/*sh
    32 Test/Installation/Convert/VERTICAL.EC
    33 Test/Installation/Convert/fort.15
     32Testing/Installation/Calc_etadot/VERTICAL.EC
     33Testing/Installation/Calc_etadot/fort.15
    3434For_developers/Sphinx/build_temp
    3535
    3636# Temporary ignorance of files!!!!
    37 Source/Fortran/Makefile.ecgate
    38 Source/Fortran/Makefile.local.gfortran.gw74
    39 Run/Control/Testgrid/
    40 Run/Control/notPublic/
    41 setup_local.sh
    42 Run/run.sh
    43 Run/run_local.sh
    44 setup.sh
     37*anne.sh
     38Run/*anne.sh
    4539Source/Fortran/pycallgraph.png
    4640Source/Python/pylint_report_7.1.txt
    4741Source/.metrics
    48 For_developers/sphinx-fortran/
    49 
    50 
    51 For_developers/GUIDE.odt
    52 For_developers/COMMANDS
    53 For_developers/class_diagram
    54 For_developers/classes.dot
    55 For_developers/classes.png
    56 For_developers/gen_docu.sh
    57 For_developers/mk_pdf2png.sh
    58 For_developers/packages.dot
    59 For_developers/packages.png
    60 For_developers/Testcases.txt
    61 For_developers/Metriken.txt
    62 For_developers/FE_testing.txt
    63 For_developers/Liste_FE_Functions_Testcoverage.xlsx
    64 
    65 
    66 
    67 
    6842
    6943Emoslib

  • Run/run.sh

    r3a54479 r98f09d2  
    1212#
    1313# @Licence:
    14 #    (C) Copyright 2014-2019.
     14#    (C) Copyright 2014-2020.
    1515#
    1616#    SPDX-License-Identifier: CC-BY-4.0

  • 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()

  • Templates/installscript.template

    r5f67883 r98f09d2  
    2929  *ecg*)
    3030  module unload grib_api
    31   module unload eccodes
    32   module unload python
    3331  module unload emos
    34   module load python3/3.6.8-01
    35   module load eccodes/2.13.0
     32  module load python3
     33  module load eccodes
    3634  module load emos/455-r64
    3735  export FLEXPART_ROOT_SCRIPTS=$fp_root_scripts
    … …  
    3937  ;;
    4038  *cca*)
    41   module unload python
    4239  module switch PrgEnv-cray PrgEnv-intel
    4340  module load python3
    44   module load eccodes/2.13.0
     41  module load eccodes
    4542  module load emos/455-r64
    4643  echo $${GROUP}

  • Templates/jobscript.template

    ra916e8f r98f09d2  
    2929  *ecg*)
    3030  module unload grib_api
    31   module unload eccodes
    32   module unload python
    3331  module unload emos
    34   module load python3/3.6.8-01
    35   module load eccodes/2.13.0
     32  module load python3
     33  module load eccodes
    3634  module load emos/455-r64
    3735  export PATH=$$$${PATH}:$fp_root_path
    3836  ;;
    3937  *cca*)
    40   module unload python
    4138  module switch PrgEnv-cray PrgEnv-intel
    4239  module load python3
    43   module load eccodes/2.13.0
     40  module load eccodes
    4441  module load emos/455-r64
    4542  export SCRATCH=$$$${TMPDIR}
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG