Skip to content

Commit

Permalink
renaming and typos (#6)
Browse files Browse the repository at this point in the history
  • Loading branch information
pat-schmitt committed Mar 3, 2023
1 parent 180a492 commit e11756a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion oggm/cli/prepro_levels.py
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ def _time_log():
from oggm.core.flowline import FluxBasedModel
evolution_model = FluxBasedModel

# conduct historical run before dynamic mu calibration
# conduct historical run before dynamic melt_f calibration
# (for comparison to old default behavior)
workflow.execute_entity_task(tasks.run_from_climate_data, gdirs,
min_ys=y0, ye=ye,
Expand Down
2 changes: 1 addition & 1 deletion oggm/core/dynamic_spinup.py
Original file line number Diff line number Diff line change
Expand Up @@ -1939,7 +1939,7 @@ def c_fun(melt_f):

# Here start with own spline minimisation algorithm
def minimise_with_spline_fit(fct_to_minimise, melt_f_guess, mismatch):
# defines limits of mu in accordance to maximal allowed change
# defines limits of melt_f in accordance to maximal allowed change
# between iterations
melt_f_limits = [melt_f_initial - melt_f_max_step_length,
melt_f_initial + melt_f_max_step_length]
Expand Down
4 changes: 2 additions & 2 deletions oggm/core/massbalance.py
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ def __init__(self, gdir,
raise InvalidWorkflowError('We now work exclusively with '
'calendar years.')

# Quick trick because we now the size of our array
# Quick trick because we know the size of our array
years = np.repeat(np.arange(time[-1].year - ny + 1,
time[-1].year + 1), 12)
pok = slice(None) # take all is default (optim)
Expand Down Expand Up @@ -1371,7 +1371,7 @@ def get_ela(self, year=None, **kwargs):


def _fallback_mb_calibration(gdir):
"""A Fallback function if climate.mu_star_calibration raises an Error.
"""A Fallback function if massbalance.mb_calibration_from_scalar_mb raises an Error.
If calibration fails, this function will still read, expand and write a
`mb_calib.json` filled with NANs.
Expand Down
2 changes: 1 addition & 1 deletion oggm/tests/test_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -4071,7 +4071,7 @@ def test_run_dynamic_melt_f_calibration_with_dynamic_spinup(self,
err_dmdtda_scaling_factor

# test that error is raised if user provides flowlines but want to
# include inversion during dynamic mu calibration
# include inversion during dynamic melt_f calibration
if do_inversion:
# artificial change of flowlines to force error
fls[0].thick = np.zeros(fls[0].nx)
Expand Down

0 comments on commit e11756a

Please sign in to comment.