Skip to content
Snippets Groups Projects
Commit 6971a118 authored by jacques.grelet_ird.fr's avatar jacques.grelet_ird.fr
Browse files

rename files and function following pep8 convention

parent 82602b2b
No related branches found
No related tags found
No related merge requests found
......@@ -65,7 +65,7 @@ class FileExtractor:
return buf
# first pass on file(s)
def firstPass(self):
def first_pass(self):
'''
Returns
------
......@@ -99,7 +99,7 @@ class FileExtractor:
# return self.n, self.m
# second pass, extract data from roscop code in fname and fill array
def secondPass(self, cfg, device):
def second_pass(self, cfg, device):
'''
Read the file to its internal dict
......@@ -188,8 +188,8 @@ if __name__ == "__main__":
fe = FileExtractor(args.fname, args.keys)
print("File(s): {}, Config: {}".format(args.fname, args.config))
cfg = toml.load(args.config)
fe.firstPass()
fe.first_pass()
print("Indices: {} x {}\nkeys: {}".format(fe.n, fe.m, fe.keys))
fe.secondPass(cfg, 'ctd')
fe.second_pass(cfg, 'ctd')
# debug
# print(fe.disp())
import logging
from netCDF4 import Dataset
from numpy import arange, dtype
from physicalParameter import Roscop
from physical_parameter import Roscop
def writeNetCDF(fileName, fe):
......
......@@ -128,9 +128,9 @@ def process(args, cfg, ti):
fe = FileExtractor(args.files, args.keys)
# cfg = toml.load(args.config)
fe.firstPass()
fe.first_pass()
# fe.secondPass(['PRES', 'TEMP', 'PSAL', 'DOX2'], cfg, 'ctd')
fe.secondPass(cfg, ti)
fe.second_pass(cfg, ti)
# fe.disp(['PRES', 'TEMP', 'PSAL', 'DOX2'])
return fe
......
File moved
import unittest
from physicalParameter import Roscop
from physical_parameter import Roscop
'''
Run test in single file
......@@ -31,20 +31,20 @@ class testRoscop(unittest.TestCase):
def test_key_TEMP(self):
''' test the standard_name for physical parameter TEMP '''
self.assertEqual(self.r.returnCode('TEMP')[
self.assertEqual(self.r['TEMP'][
'standard_name'], 'sea_water_temperature')
self.assertEqual(self.r.returnCode('TEMP')[
self.assertEqual(self.r['TEMP'][
'units'], 'degree_Celsius')
self.assertEqual(self.r.returnCode('TEMP')[
self.assertEqual(self.r['TEMP'][
'comment'], 'Ocean temperature in Degrees Celsius')
def test_key_PSAL(self):
''' test the standard_name for physical parameter PSAL '''
self.assertEqual(self.r.returnCode('PSAL')[
self.assertEqual(self.r['PSAL'][
'standard_name'], 'sea_water_salinity')
self.assertEqual(self.r.returnCode('PSAL')[
self.assertEqual(self.r['PSAL'][
'conventions'], 'PSU')
self.assertEqual(self.r.returnCode('PSAL')[
self.assertEqual(self.r['PSAL'][
'comment'], 'Ocean practical salinity (PSS-78)')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment