Skip to content

Commit

Permalink
Change directory structure
Browse files Browse the repository at this point in the history
  • Loading branch information
benhills committed Jun 7, 2022
1 parent 239804a commit c6f17c4
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions iceotherm/lib/analytical_solutions.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
from scipy.special import erf
from scipy.integrate import quad
from scipy.special import lambertw
from .constants import constants
from iceotherm.lib.constants import constants

from .ice_properties import *
from iceotherm.lib.ice_properties import *

def Robin_T(m,T_bulk=None,const=constants(),melt=True,verbose=False):
"""
Expand Down
2 changes: 1 addition & 1 deletion iceotherm/lib/cylindricalstefan/concentration_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ def Tf_depression(C,solute='methanol',linear=False,data_dir=None,const=const):
return Tf
else:
if data_dir is None:
data_dir='./data/'
data_dir='../../../data/'
if solute=='methanol':
# Get percent by mass
PBM = C_pbm(C,const.rhom)
Expand Down
2 changes: 1 addition & 1 deletion iceotherm/lib/ice_properties.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import numpy as np
from scipy.optimize import minimize
from .constants import constants
from iceotherm.lib.constants import constants

# ---------------------------------------------------

Expand Down
8 changes: 4 additions & 4 deletions iceotherm/lib/numerical_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
import numpy as np
from scipy import sparse
from scipy.integrate import cumtrapz
from .analytical_solutions import *
from .ice_properties import *
from .supporting_functions import *
from .constants import constants
from iceotherm.lib.analytical_solutions import *
from iceotherm.lib.ice_properties import *
from iceotherm.lib.supporting_functions import *
from iceotherm.lib.constants import constants

# Instantiate the constants class
const = constants()
Expand Down
2 changes: 1 addition & 1 deletion iceotherm/lib/simple_conduction.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import numpy as np
from scipy.special import erfc
from .constants import constants
from iceotherm.lib.constants import constants
const = constants()

# Analytic solutions to conduction problems
Expand Down
2 changes: 1 addition & 1 deletion iceotherm/lib/supporting_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"""

import numpy as np
from .constants import constants
from iceotherm.lib.constants import constants
const = constants()
from scipy.interpolate import interp1d

Expand Down

0 comments on commit c6f17c4

Please sign in to comment.