Commit f3fe3308 authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Switch to USE_DYN_ORDERS runtime option

parent 31f6a086
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -328,14 +328,14 @@ def load_model(model_file):
                    for j in range(expected_radii):
                        sconf['rcf'][i][j] = float(model['particle_settings']['rad_frac'][i][j])
        # Create the gconf dict
        use_refinement = False
        use_refinement = True
        dyn_orders = True
        try:
            use_refinement = False if model['system_settings']['refinement'] == "0" else True
            use_refinement = False if int(model['system_settings']['refinement']) == 0 else True
        except KeyError:
            use_refinement = False
            use_refinement = True
        try:
            dyn_orders = False if model['radiation_settings']['dyn_orders'] == "0" else True
            dyn_orders = False if int(model['system_settings']['dyn_orders']) == 0 else True
        except KeyError:
            dyn_orders = True
        str_polar = model['radiation_settings']['polarization']
@@ -882,10 +882,10 @@ def write_legacy_gconf(conf):
    else:
        str_line = "USE_REFINEMENT=0\n"
    output.write(str_line)
    if (not conf['dyn_orders']):
        str_line = "USE_DYN_ORDER=0\n"
    if (conf['dyn_orders']):
        str_line = "USE_DYN_ORDERS=1\n"
    else:
        str_line = "USE_DYN_ORDER=1\n"
        str_line = "USE_DYN_ORDERS=0\n"
    output.write(str_line)
    output.close()
    return result