add parameters to database (#1)

get_database.py

@@ -88,6 +88,9 @@ def __init__(self, study=''):
         # folder containing model images
         self.fpath_png = os.path.join(self.db_path, 'png')
 
+        # file containing simulation parameters
+        self.db_params = os.path.join(self.db_path, 'parameters.npy')
+
         # folder for simulation studies
         self.fpath_study = os.path.join(self.fpath_studies, self.study)
 
@@ -121,9 +124,7 @@ def exclude_geometries(self, geometries):
         return [g for g in geometries if not self.is_excluded(g)]
 
     def get_geometries(self):
-        geometries = os.listdir(self.fpath_sim)
-        geometries.sort()
-        return geometries
+        return sorted(get_dict(self.db_params).keys())
 
     def get_geometries_select(self, name):
         if name == 'paper':
@@ -244,7 +245,7 @@ def get_bcs_local(self, geo):
         return None
 
     def get_bcs(self, geo):
-        return get_dict(os.path.join(self.db_path, 'parameters.npy'))[geo]
+        return get_dict(self.db_params)[geo]
 
     def has_loop(self, geo):
         # todo: find automatic way to check for loop

get_sv_project.py

@@ -831,14 +831,16 @@ def check_files(db, geo):
     return True, None
 
 
-def create_sv_project(db, geo):
+def create_sv_project(db, geo, mode=''):
     success, err = check_files(db, geo)
     if not success:
         return err
 
     # if True:
     try:
-        print('Estimated cycles: ' + str(get_sv_opt(db, geo)['n_cycle']))
+        opt = get_sv_opt(db, geo, mode)
+        print('Running geometry ' + geo)
+        print('Estimated cycles: ' + str(opt['n_cycle']))
         make_folders(db, geo)
         write_inflow(db, geo, '3d')
         copy_files(db, geo)
@@ -862,15 +864,18 @@ def create_sv_project(db, geo):
         return e
 
 
-def main(db, geometries):
+def main(db, geometries, params):
     for geo in geometries:
-        print('Running geometry ' + geo)
 
-        err = create_sv_project(db, geo)
+        if params.mode is not None:
+            mode = params.mode
+        else:
+            mode = ''
+        err = create_sv_project(db, geo, mode=mode)
         print('  ' + str(err))
 
 
 if __name__ == '__main__':
     descr = 'Generate an svproject folder'
-    d, g, _ = input_args(descr)
-    main(d, g)
+    d, g, p = input_args(descr)
+    main(d, g, p)