Changeset 90809b7 in flex_extract.git


Ignore:
Timestamp:
Jul 29, 2019, 10:08:39 AM (5 years ago)
Author:
Anne Philipp <anne.philipp@…>
Branches:
master, ctbto, dev
Children:
8bcf3ec
Parents:
91e4dba
Message:

python2 downgrade / changed flexpartdir to installdir / added purefc check /

File:
1 edited

Legend:

Unmodified
Added
Removed
  • source/python/classes/ControlFile.py

    r90a1ca0 r90809b7  
    1 #!/usr/bin/env python3
     1#!/usr/bin/env python
    22# -*- coding: utf-8 -*-
    33#*******************************************************************************
     
    4343# MODULES
    4444# ------------------------------------------------------------------------------
     45from __future__ import print_function
     46
    4547import os
    4648import re
    4749import sys
    4850import inspect
    49 import numpy as np
    5051
    5152# software specific classes and modules from flex_extract
     
    274275        _config.PATH_FORTRAN_SRC.
    275276
    276     flexpartdir : str
     277    installdir : str
    277278        Path to a FLEXPART root directory. Default value is None.
    278279
     
    414415        self.flexextractdir = _config.PATH_FLEXEXTRACT_DIR
    415416        self.exedir = _config.PATH_FORTRAN_SRC
    416         self.flexpartdir = None
     417        self.installdir = None
    417418        self.makefile = 'Makefile.gfortran'
    418419        self.destination = None
     
    608609                    self.ecuid, self.ecgid)
    609610
    610         self.outputdir, self.flexpartdir = check_pathes(self.inputdir,
    611              self.outputdir, self.flexpartdir, self.flexextractdir)
     611        self.outputdir, self.installdir = check_pathes(self.inputdir,
     612             self.outputdir, self.installdir, self.flexextractdir)
    612613
    613614        self.start_date, self.end_date = check_dates(self.start_date,
     
    630631
    631632        self.time = check_time(self.time)
     633
     634        self.purefc = check_purefc(self.type)
    632635
    633636        self.type, self.time, self.step = check_len_type_time_step(self.type,
     
    639642        self.acctype = check_acctype(self.acctype, self.type)
    640643
    641         self.acctime = check_acctime(self.acctime, self.marsclass, self.purefc)
     644        self.acctime = check_acctime(self.acctime, self.marsclass,
     645                                     self.purefc, self.time)
    642646
    643647        self.accmaxstep = check_accmaxstep(self.accmaxstep, self.marsclass,
    644648                                           self.purefc, self.maxstep)
    645 
    646         self.purefc = check_purefc(self.type)
    647649
    648650        self.grid = check_grid(self.grid)
     
    662664        '''Just generates a list of strings containing the attributes and
    663665        assigned values except the attributes "_expanded", "exedir",
    664         "flexextractdir" and "flexpartdir".
     666        "flexextractdir" and "installdir".
    665667
    666668        Parameters
     
    672674            A sorted list of the all ControlFile class attributes with
    673675            their values except the attributes "_expanded", "exedir",
    674             "flexextractdir" and "flexpartdir".
     676            "flexextractdir" and "installdir".
    675677        '''
    676678
     
    686688            elif 'exedir' in item[0]:
    687689                pass
    688             elif 'flexpartdir' in item[0]:
     690            elif 'installdir' in item[0]:
    689691                pass
    690692            elif 'flexextractdir' in item[0]:
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG