Skip to content
This repository was archived by the owner on Nov 27, 2023. It is now read-only.

Commit f48660d

Browse files
author
rhammond
committed
update for working imports
1 parent 7815975 commit f48660d

File tree

5 files changed

+18
-16
lines changed

5 files changed

+18
-16
lines changed

README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# pyfast
2-
Submodule for regression testing for NREL-supported OpenFAST: https://github.com/OpenFAST/openfast
32

3+
[![Python: 3.6+](https://img.shields.io/badge/python-3.6%2B-informational)](https://www.python.org/)
44
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
5+
6+
Submodule for regression testing for NREL-supported OpenFAST: https://github.com/OpenFAST/openfast

__init__.py

-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
"""Initializes the package"""
2-
3-
from pyfast import Executor, utilities

pyFAST/executor.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
import bokeh
1313
import numpy as np
14-
from pyfast.pyfast.utilities import (
14+
from pyfast.utilities import (
1515
load_output,
1616
validate_file,
1717
calculate_norms,

pyFAST/utilities/__init__.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""Initializes the utility functions"""
22

33

4-
from .norm import calculate_norms
5-
from .fast_io import load_output
6-
from .plotting import create_case_summary
7-
from .utilities import *
4+
from pyfast.utilities.norm import calculate_norms
5+
from pyfast.utilities.fast_io import load_output
6+
from pyfast.utilities.plotting import create_case_summary
7+
from pyfast.utilities.utilities import *

pyFAST/utilities/norm.py

+10-8
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,8 @@
77

88
import numpy as np
99
import numpy.linalg as LA
10-
from pyfast.utilities import load_output, validate_file
11-
12-
NORM_MAP = {
13-
"max_norm": max_norm,
14-
"max_norm_over_range": max_norm_over_range,
15-
"l2_norm": l2_norm,
16-
"relative_l2_norm": relative_l2_norm,
17-
}
10+
from pyfast.utilities.fast_io import load_output
11+
from pyfast.utilities.utilities import validate_file
1812

1913

2014
def diff(baseline: np.ndarray, test: np.ndarray, abs_val: bool = True) -> np.ndarray:
@@ -230,6 +224,14 @@ def calculate_norms(
230224
return norm_results
231225

232226

227+
NORM_MAP = {
228+
"max_norm": max_norm,
229+
"max_norm_over_range": max_norm_over_range,
230+
"l2_norm": l2_norm,
231+
"relative_l2_norm": relative_l2_norm,
232+
}
233+
234+
233235
if __name__ == "__main__":
234236

235237
parser = argparse.ArgumentParser(

0 commit comments

Comments
 (0)