diff --git a/cace/__version__.py b/cace/__version__.py index 363cf38..396c77f 100644 --- a/cace/__version__.py +++ b/cace/__version__.py @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -__version__ = '2.1.15' +__version__ = '2.1.16' if __name__ == '__main__': print(__version__, end='') diff --git a/cace/common/cace_launch.py b/cace/common/cace_launch.py index 518fcf5..74fb106 100755 --- a/cace/common/cace_launch.py +++ b/cace/common/cace_launch.py @@ -317,7 +317,11 @@ def cace_launch(dsheet, param): for result in results: try: - presult = result.get(timeout=300) + # Note: Previously used result.get(timeout=300). + # This was intended to prevent hung simulations from + # hanging CACE. But with multiprocessing, the timeout + # itself causes CACE to hang, making it less than useless. + presult = result.get() except Exception as e: print('simulate_and_measure failed with exception:') print(e)