Changeset 90809b7 in flex_extract.git
- Timestamp:
- Jul 29, 2019, 10:08:39 AM (5 years ago)
- Branches:
- master, ctbto, dev
- Children:
- 8bcf3ec
- Parents:
- 91e4dba
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
source/python/classes/ControlFile.py
r90a1ca0 r90809b7 1 #!/usr/bin/env python 31 #!/usr/bin/env python 2 2 # -*- coding: utf-8 -*- 3 3 #******************************************************************************* … … 43 43 # MODULES 44 44 # ------------------------------------------------------------------------------ 45 from __future__ import print_function 46 45 47 import os 46 48 import re 47 49 import sys 48 50 import inspect 49 import numpy as np50 51 51 52 # software specific classes and modules from flex_extract … … 274 275 _config.PATH_FORTRAN_SRC. 275 276 276 flexpartdir : str277 installdir : str 277 278 Path to a FLEXPART root directory. Default value is None. 278 279 … … 414 415 self.flexextractdir = _config.PATH_FLEXEXTRACT_DIR 415 416 self.exedir = _config.PATH_FORTRAN_SRC 416 self. flexpartdir = None417 self.installdir = None 417 418 self.makefile = 'Makefile.gfortran' 418 419 self.destination = None … … 608 609 self.ecuid, self.ecgid) 609 610 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) 612 613 613 614 self.start_date, self.end_date = check_dates(self.start_date, … … 630 631 631 632 self.time = check_time(self.time) 633 634 self.purefc = check_purefc(self.type) 632 635 633 636 self.type, self.time, self.step = check_len_type_time_step(self.type, … … 639 642 self.acctype = check_acctype(self.acctype, self.type) 640 643 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) 642 646 643 647 self.accmaxstep = check_accmaxstep(self.accmaxstep, self.marsclass, 644 648 self.purefc, self.maxstep) 645 646 self.purefc = check_purefc(self.type)647 649 648 650 self.grid = check_grid(self.grid) … … 662 664 '''Just generates a list of strings containing the attributes and 663 665 assigned values except the attributes "_expanded", "exedir", 664 "flexextractdir" and " flexpartdir".666 "flexextractdir" and "installdir". 665 667 666 668 Parameters … … 672 674 A sorted list of the all ControlFile class attributes with 673 675 their values except the attributes "_expanded", "exedir", 674 "flexextractdir" and " flexpartdir".676 "flexextractdir" and "installdir". 675 677 ''' 676 678 … … 686 688 elif 'exedir' in item[0]: 687 689 pass 688 elif ' flexpartdir' in item[0]:690 elif 'installdir' in item[0]: 689 691 pass 690 692 elif 'flexextractdir' in item[0]:
Note: See TracChangeset
for help on using the changeset viewer.