Changeset 287


Ignore:
Timestamp:
05/02/15 16:50:31 (5 years ago)
Author:
mjuckes
Message:

adjusted CCMI requirements; added '-v' and '--unitTest' args

Location:
CCCC/trunk/ceda_cc
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • CCCC/trunk/ceda_cc/c4.py

    r276 r287  
    66      import summary 
    77      summary.main() 
     8      raise SystemExit(0) 
     9elif __name__ == '__main__' and sys.argv[1] == '-v': 
     10      from versionConfig import version, versionComment 
     11      print 'ceda-cc version %s [%s]' % (version,versionComment) 
     12      raise SystemExit(0) 
     13elif __name__ == '__main__' and sys.argv[1] == '--unitTest': 
     14      print "Starting test suite 1" 
     15      import unitTestsS1 
     16      print "Starting test suite 2" 
     17      import unitTestsS2 
     18      print "Tests completed" 
    819      raise SystemExit(0) 
    920 
  • CCCC/trunk/ceda_cc/config/ccmi_vocabs/globalAts.txt

    r163 r287  
    99frequency =  a string indicating the interval between individual time samples. 
    1010initialization_method = an integer (≥ 1) referring to the initialization method or observational dataset used to initialize the simulation. 
    11 initialization_description = a string containing the details of the particular initialization method used for the experiment. This is only required if groups are submitting runs with more than one initialization method. 
     11## initialization_description = a string containing the details of the particular initialization method used for the experiment. This is only required if groups are submitting runs with more than one initialization method. 
    1212institute_id = a short acronym describing the institution (e.g., 'GFDL'). 
    1313institution = a more free-form attribute to identify the institution that generated the data. 
     
    1717parent_experiment_rip = identifies which member of an ensemble of parent simulations ('N/A' if not relevant) 
    1818physics_version = an integer (≥ 1) referring to the physics version used by the model for this run.  
    19 physics_description = a string describing the particular variations in the model that produced the current physics versions. 
     19## physics_description = a string describing the particular variations in the model that produced the current physics versions. 
    2020product = 'output', which indicates that the data you are writing is model output. 
    2121project_id = 'CCMI1' 
  • CCCC/trunk/ceda_cc/config_c4.py

    r279 r287  
    44import os.path as op 
    55import shutil, collections 
     6from versionConfig import version, versionComment 
    67 
    78NT_project = collections.namedtuple( 'project', ['id','v'] ) 
     
    212213      self.controlledGlobalAttributes = [ 'experiment_id', 'project', 'frequency' ] 
    213214      self.globalAttributesInFn = [None,'@mip_id','model_id','experiment_id','@ensemble'] 
    214       self.requiredVarAttributes = ['long_name', 'standard_name', 'units'] 
     215      self.requiredVarAttributes = ['long_name', 'units'] 
    215216      self.drsMappings = {'variable':'@var', 'institute':'institute_id', 'product':'product', 'experiment':'experiment_id', \ 
    216217                        'ensemble':'@ensemble', 'model':'model_id', 'realm':'modeling_realm', \ 
  • CCCC/trunk/ceda_cc/unitTestsS2.py

    r282 r287  
    5353 
    5454  testId = '#11.002' 
    55   if m.monitor.fhCountMax < 10: 
     55  if m.monitor.fhCountMax < 15: 
    5656    print 'OK: [%s]: fhCountMax = %s' % ( testId, m.monitor.fhCountMax ) 
    5757  else: 
Note: See TracChangeset for help on using the changeset viewer.