Commit 570a1ddd authored by Martin Reinecke's avatar Martin Reinecke

revert a few temporary changes

parent 4f0c5156
Pipeline #15418 passed with stage
in 7 minutes and 26 seconds
...@@ -113,17 +113,17 @@ if __name__ == "__main__": ...@@ -113,17 +113,17 @@ if __name__ == "__main__":
x = a_energy.value x = a_energy.value
print(x, iteration) print(x, iteration)
minimizer1 = RelaxedNewton(convergence_tolerance=1e-8, minimizer1 = RelaxedNewton(convergence_tolerance=1e-4,
convergence_level=1, convergence_level=1,
iteration_limit=5, iteration_limit=5,
callback=convergence_measure) callback=convergence_measure)
minimizer2 = VL_BFGS(convergence_tolerance=1e-8, minimizer2 = VL_BFGS(convergence_tolerance=1e-4,
convergence_level=1, convergence_level=1,
iteration_limit=1000, iteration_limit=20,
callback=convergence_measure, callback=convergence_measure,
max_history_length=20) max_history_length=20)
minimizer3 = SteepestDescent(convergence_tolerance=1e-8, minimizer3 = SteepestDescent(convergence_tolerance=1e-4,
iteration_limit=500, iteration_limit=100,
callback=convergence_measure) callback=convergence_measure)
# Set starting position # Set starting position
...@@ -132,7 +132,7 @@ if __name__ == "__main__": ...@@ -132,7 +132,7 @@ if __name__ == "__main__":
t0 = Field(p_space, val=log(1./(1+p_space.kindex)**2)) t0 = Field(p_space, val=log(1./(1+p_space.kindex)**2))
for i in range(50): for i in range(500):
S0 = create_power_operator(h_space, power_spectrum=exp(t0), S0 = create_power_operator(h_space, power_spectrum=exp(t0),
distribution_strategy=distribution_strategy) distribution_strategy=distribution_strategy)
......
...@@ -182,7 +182,7 @@ class Field(Loggable, Versionable, object): ...@@ -182,7 +182,7 @@ class Field(Loggable, Versionable, object):
elif isinstance(val, Field): elif isinstance(val, Field):
distribution_strategy = val.distribution_strategy distribution_strategy = val.distribution_strategy
else: else:
#self.logger.debug("distribution_strategy set to default!") self.logger.debug("distribution_strategy set to default!")
distribution_strategy = gc['default_distribution_strategy'] distribution_strategy = gc['default_distribution_strategy']
elif distribution_strategy not in DISTRIBUTION_STRATEGIES['global']: elif distribution_strategy not in DISTRIBUTION_STRATEGIES['global']:
raise ValueError( raise ValueError(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment