Changeset ba99230 in flex_extract.git for Source


Ignore:
Timestamp:
Jul 29, 2019, 10:50:47 AM (5 years ago)
Author:
Anne Philipp <anne.philipp@…>
Branches:
master, ctbto, dev
Children:
0007a71
Parents:
668b5d9
Message:

capitalize all directory names and adapt pathes in files

Location:
Source
Files:
41 moved

Legend:

Unmodified
Added
Removed
  • Source/Python/Classes/ControlFile.py

    r90809b7 rba99230  
    5353sys.path.append('../')
    5454import _config
    55 from mods.tools import my_error, silent_remove
    56 from mods.checks import (check_grid, check_area, check_levels, check_purefc,
     55from Mods.tools import my_error, silent_remove
     56from Mods.checks import (check_grid, check_area, check_levels, check_purefc,
    5757                         check_step, check_mail, check_queue, check_pathes,
    5858                         check_dates, check_maxstep, check_type, check_request,
  • Source/Python/Classes/EcFlexpart.py

    rc49aa73 rba99230  
    6666sys.path.append('../')
    6767import _config
    68 from classes.GribUtil import GribUtil
    69 from mods.tools import (init128, to_param_id, silent_remove, product,
     68from Classes.GribUtil import GribUtil
     69from Mods.tools import (init128, to_param_id, silent_remove, product,
    7070                        my_error, make_dir, get_informations, get_dimensions,
    7171                        execute_subprocess, to_param_id_with_tablenumber,
    7272                        generate_retrieval_period_boundary)
    73 from classes.MarsRetrieval import MarsRetrieval
    74 from classes.UioFiles import UioFiles
    75 import mods.disaggregation as disaggregation
     73from Classes.MarsRetrieval import MarsRetrieval
     74from Classes.UioFiles import UioFiles
     75import Mods.disaggregation as disaggregation
    7676
    7777# ------------------------------------------------------------------------------
  • Source/Python/Classes/UioFiles.py

    r8bcf3ec rba99230  
    4141# software specific modules from flex_extract
    4242sys.path.append('../')
    43 from mods.tools import silent_remove, get_list_as_string
     43from Mods.tools import silent_remove, get_list_as_string
    4444
    4545# ------------------------------------------------------------------------------
  • Source/Python/Mods/checks.py

    re7708b2 rba99230  
    3434    import builtins as exceptions
    3535from datetime import datetime
    36 from mods.tools import my_error, silent_remove
     36from Mods.tools import my_error, silent_remove
    3737# ------------------------------------------------------------------------------
    3838# FUNCTIONS
  • Source/Python/Mods/get_mars_data.py

    r7e25255 rba99230  
    6969    inspect.getfile(inspect.currentframe()))) + '/../')
    7070import _config
    71 from mods.tools import (setup_controldata, my_error, normal_exit, get_cmdline_args,
     71from Mods.tools import (setup_controldata, my_error, normal_exit, get_cmdline_args,
    7272                   read_ecenv, make_dir)
    73 from classes.EcFlexpart import EcFlexpart
    74 from classes.UioFiles import UioFiles
    75 from classes.MarsRetrieval import MarsRetrieval
     73from Classes.EcFlexpart import EcFlexpart
     74from Classes.UioFiles import UioFiles
     75from Classes.MarsRetrieval import MarsRetrieval
    7676
    7777try:
  • Source/Python/Mods/prepare_flexpart.py

    r0e08483 rba99230  
    7373    inspect.getfile(inspect.currentframe()))) + '/../')
    7474import _config
    75 from mods.checks import check_ppid
    76 from classes.UioFiles import UioFiles
    77 from classes.ControlFile import ControlFile
    78 from mods.tools import (setup_controldata, clean_up, get_cmdline_args,
     75from Mods.checks import check_ppid
     76from Classes.UioFiles import UioFiles
     77from Classes.ControlFile import ControlFile
     78from Mods.tools import (setup_controldata, clean_up, get_cmdline_args,
    7979                        read_ecenv, make_dir, normal_exit)
    80 from classes.EcFlexpart import EcFlexpart
     80from Classes.EcFlexpart import EcFlexpart
    8181
    8282# ------------------------------------------------------------------------------
  • Source/Python/Mods/tools.py

    r6470422 rba99230  
    101101    '''
    102102    import _config
    103     from classes.ControlFile import ControlFile
     103    from Classes.ControlFile import ControlFile
    104104
    105105    args = get_cmdline_args()
  • Source/Python/_config.py

    r91e4dba rba99230  
    7171
    7272FLEXEXTRACT_DIRNAME = 'flex_extract_v' + _VERSION_STR
    73 INPUT_DIRNAME_DEFAULT = 'workspace'
     73INPUT_DIRNAME_DEFAULT = 'Workspace'
    7474
    7575# ------------------------------------------------------------------------------
     
    8686PATH_FLEXEXTRACT_DIR = os.path.normpath(os.path.dirname(os.path.abspath(
    8787    inspect.getfile(inspect.currentframe()))) + '/../../')
    88 PATH_RUN_DIR = os.path.join(PATH_FLEXEXTRACT_DIR, 'run')
    89 PATH_SOURCES = os.path.join(PATH_FLEXEXTRACT_DIR, 'source')
    90 PATH_TEMPLATES = os.path.join(PATH_FLEXEXTRACT_DIR, 'templates')
     88PATH_RUN_DIR = os.path.join(PATH_FLEXEXTRACT_DIR, 'Run')
     89PATH_SOURCES = os.path.join(PATH_FLEXEXTRACT_DIR, 'Source')
     90PATH_TEMPLATES = os.path.join(PATH_FLEXEXTRACT_DIR, 'Templates')
    9191PATH_ECMWF_ENV = os.path.join(PATH_RUN_DIR, FILE_USER_ENVVARS)
    9292PATH_GRIBTABLE = os.path.join(PATH_TEMPLATES, FILE_GRIBTABLE)
    93 PATH_JOBSCRIPTS = os.path.join(PATH_RUN_DIR, 'jobscripts')
    94 PATH_FORTRAN_SRC = os.path.join(PATH_SOURCES, 'fortran')
    95 PATH_PYTHONTEST_SRC = os.path.join(PATH_SOURCES, 'pythontest')
     93PATH_JOBSCRIPTS = os.path.join(PATH_RUN_DIR, 'Jobscripts')
     94PATH_FORTRAN_SRC = os.path.join(PATH_SOURCES, 'Fortran')
     95PATH_PYTHONTEST_SRC = os.path.join(PATH_SOURCES, 'Pythontest')
    9696PATH_INPUT_DIR = os.path.join(PATH_RUN_DIR, INPUT_DIRNAME_DEFAULT)
    97 PATH_TEST = os.path.join(PATH_FLEXEXTRACT_DIR, 'test')
     97PATH_TEST = os.path.join(PATH_FLEXEXTRACT_DIR, 'Test')
    9898if os.getenv('CONTROL'):
    9999    # this is only needed if (gateway) version with job script is used!
     
    102102    PATH_CONTROLFILES = '.'
    103103else:
    104     PATH_CONTROLFILES = os.path.join(PATH_RUN_DIR, 'control')
     104    PATH_CONTROLFILES = os.path.join(PATH_RUN_DIR, 'Control')
    105105#
    106106# ------------------------------------------------------------------------------
  • Source/Python/install.py

    r8ce3be6 rba99230  
    7474# software specific classes and modules from flex_extract
    7575import _config
    76 from classes.ControlFile import ControlFile
    77 from classes.UioFiles import UioFiles
    78 from mods.tools import (make_dir, put_file_to_ecserver, submit_job_to_ecserver,
     76from Classes.ControlFile import ControlFile
     77from Classes.UioFiles import UioFiles
     78from Mods.tools import (make_dir, put_file_to_ecserver, submit_job_to_ecserver,
    7979                        silent_remove, execute_subprocess, none_or_str)
    8080
  • Source/Python/submit.py

    ra1011e7 rba99230  
    6969# software specific classes and modules from flex_extract
    7070import _config
    71 from mods.tools import (setup_controldata, normal_exit, get_cmdline_args,
     71from Mods.tools import (setup_controldata, normal_exit, get_cmdline_args,
    7272                         submit_job_to_ecserver, read_ecenv)
    73 from mods.get_mars_data import get_mars_data
    74 from mods.prepare_flexpart import prepare_flexpart
    75 from classes.ControlFile import ControlFile
     73from Mods.get_mars_data import get_mars_data
     74from Mods.prepare_flexpart import prepare_flexpart
     75from Classes.ControlFile import ControlFile
    7676
    7777
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG