diff --git a/src/scripts/model_maker.py b/src/scripts/model_maker.py index db848890cbfe7eadfc35dcdc0b5fb372d3e6d99e..066da49f321bc8757f6c1902f489955e3026858d 100755 --- a/src/scripts/model_maker.py +++ b/src/scripts/model_maker.py @@ -371,9 +371,11 @@ def load_model(model_file): if (len_vec_x == 0): # Generate random cluster rnd_seed = int(model['system_settings']['rnd_seed']) - max_rad = float(model['particle_settings']['max_rad']) - # random_aggregate() checks internally whether application is INCLUSION - #random_aggregate(sconf, gconf, rnd_seed, max_rad) + try: + max_rad = float(model['particle_settings']['max_rad']) + except KeyError: + print("ERROR: random model generation requires specification of particle_settings:max_rad.") + return (None, None) rnd_engine = "COMPACT" try: rnd_engine = model['system_settings']['rnd_engine'] @@ -386,6 +388,7 @@ def load_model(model_file): print("ERROR: compact random generator works only when all sphere types have the same radius.") return (None, None) elif (rnd_engine == "LOOSE"): + # random_aggregate() checks internally whether application is INCLUSION check = random_aggregate(sconf, gconf, rnd_seed, max_rad) else: print("ERROR: unrecognized random generator engine.")