allow -setnumber

bin/args.py

@@ -4,7 +4,7 @@ Copyright (C) 2017 N. Marsic, F. Wolf, S. Schoeps and H. De Gersem,
 Institut fuer Theorie Elektromagnetischer Felder (TEMF),
 Technische Universitaet Darmstadt.
 
-See the LICENSE.txt and README.txt for more license and copyright information.
+See the LICENSE.txt and README.md for more license and copyright information.
 """
 
 import argparse
@@ -17,6 +17,7 @@ def parse():
     # Initialise
     parser = argparse.ArgumentParser(prog="cim.py",
                                      description=desc,
+                                     formatter_class=MyFormatter,
                                      epilog="authors: " +
                                             "N. Marsic, F. Wolf, " +
                                             "S. Schoeps and H. De Gersem")
@@ -44,6 +45,9 @@ def parse():
                         help="step size for increasing col(A0)")
     parser.add_argument("-rankTol", type=float, default=1e-4,
                         help="relative tolerance for rank test")
+    parser.add_argument("-setnumber", type=str, default=[], action='append',
+                        nargs=2, metavar=('NAME', 'VALUE'),
+                        help="set constant number NAME=VALUE")
     parser.add_argument("-quiet", action='store_true',
                         help="should I be quiet?")
 
@@ -51,10 +55,31 @@ def parse():
     return parser.parse_args()
 
 
+## Import only parse (other functions are just helpers)
+__all__ = ['parse']
+
+
+## Helper
 desc = ("a non-linear eigenvalue solver " +
         "using the contour integral method proposed by W.-J. Beyn " +
         "coupled with a GetDP formulation.")
 
 
-## Import only parse (other functions are just helpers)
-__all__ = ['parse']
+class MyFormatter(argparse.HelpFormatter):
+    """ Custom Formatter
+    """
+
+    def __init__(self, prog):
+        super(MyFormatter, self).__init__(prog,
+                                          indent_increment=2,
+                                          max_help_position=30,
+                                          width=None)
+
+    def _get_help_string(self, action):
+        help = action.help
+        if '%(default)' not in action.help:
+            if action.default is not argparse.SUPPRESS:
+                defaulting_nargs = [argparse.OPTIONAL, argparse.ZERO_OR_MORE]
+                if action.option_strings or action.nargs in defaulting_nargs:
+                    help += ' (default: %(default)s)'
+        return help

bin/beyn.py

@@ -4,7 +4,7 @@ Copyright (C) 2017 N. Marsic, F. Wolf, S. Schoeps and H. De Gersem,
 Institut fuer Theorie Elektromagnetischer Felder (TEMF),
 Technische Universitaet Darmstadt.
 
-See the LICENSE.txt and README.txt for more license and copyright information.
+See the LICENSE.txt and README.md for more license and copyright information.
 """
 
 import solver as Solver

bin/cim.py

@@ -5,7 +5,7 @@ Copyright (C) 2017 N. Marsic, F. Wolf, S. Schoeps and H. De Gersem,
 Institut fuer Theorie Elektromagnetischer Felder (TEMF),
 Technische Universitaet Darmstadt.
 
-See the LICENSE.txt and README.txt for more license and copyright information.
+See the LICENSE.txt and README.md for more license and copyright information.
 """
 
 import solver as Solver
@@ -16,8 +16,15 @@ import args   as args
 # Parse arguments
 arg = args.parse()
 
+# Prepare variables of -setnumber for GetDP
+setnumber = []
+for i in arg.setnumber:
+    setnumber.append("-setnumber")
+    for j in i:
+        setnumber.append(j)
+
 # Initialise GetDP
-operator = Solver.GetDPWave(arg.pro, arg.mesh, arg.resolution)
+operator = Solver.GetDPWave(arg.pro, arg.mesh, arg.resolution, setnumber)
 
 # Compute
 l, V, r = Beyn.simple(operator, arg.origin, arg.radius,

bin/solver.py

@@ -4,7 +4,7 @@ Copyright (C) 2017 N. Marsic, F. Wolf, S. Schoeps and H. De Gersem,
 Institut fuer Theorie Elektromagnetischer Felder (TEMF),
 Technische Universitaet Darmstadt.
 
-See the LICENSE.txt and README.txt for more license and copyright information.
+See the LICENSE.txt and README.md for more license and copyright information.
 """
 
 import getdp as GetDP
@@ -26,24 +26,29 @@ class GetDPWave:
     fileName -- post-processing file name
     """
 
-    def __init__(self, pro, mesh, resolution):
+    def __init__(self, pro, mesh, resolution, optional=[]):
         """Instanciates a new SolverGetDP with a full '-solve'
 
         Keyword arguments:
         pro -- the .pro file to use
         mesh -- the .msh file to use
         resolution -- the resolution (from the .pro file) to use
+        optional -- optional arguments for GetDP (default value = [])
+
+        Optional argument has the following structure:
+        ["GetDP option", "value 1", "value 2", ..., "GetDP option", ...]
         """
         # Save
         self.__pro        = pro
         self.__mesh       = mesh
         self.__resolution = resolution
+        self.__optional   = optional
 
         # Generate DoFs and initialise RHS and solution vectors in GetDP
         GetDP.GetDP(["getdp",     self.__pro,
                      "-msh",      self.__mesh,
                      "-solve",    self.__resolution,
-                     "-v", "2"])
+                     "-v", "2"] + self.__optional)
 
     def solution(self):
         """Returns the solution"""
@@ -64,7 +69,7 @@ class GetDPWave:
         GetDP.GetDPSetNumber("doApply", 1)
         GetDP.GetDP(["getdp",  self.__pro,
                      "-msh",   self.__mesh,
-                     "-cal"])
+                     "-cal"] + self.__optional)
         GetDP.GetDPSetNumber("doApply", 0)
 
     def solve(self, b, w):
@@ -75,7 +80,7 @@ class GetDPWave:
         GetDP.GetDPSetNumber("imposeRHS", 1)
         GetDP.GetDP(["getdp",  self.__pro,
                      "-msh",   self.__mesh,
-                     "-cal"])
+                     "-cal"] + self.__optional)
         GetDP.GetDPSetNumber("imposeRHS", 0)
 
     def view(self, x, fileName):
@@ -92,7 +97,7 @@ class GetDPWave:
         GetDP.GetDPSetString("fileName", fileName)
         GetDP.GetDP(["getdp",  self.__pro,
                      "-msh",   self.__mesh,
-                     "-cal"])
+                     "-cal"] + self.__optional)
         GetDP.GetDPSetNumber("doPostpro", 0)
 
     @staticmethod

example/maxwell_sibc/Makefile

@@ -6,7 +6,7 @@ init:
 	gmsh sphere.geo -3
 
 cim:
-	python ${BIN}/cim.py sphere.pro sphere.msh Solve 8.22543e9+2.46361e1j 1e8 -nodes 10 -lStart 4
+	python ${BIN}/cim.py sphere.pro sphere.msh Solve 8.22543e9+2.46361e1j 1e8 -nodes 10 -lStart 4 -setnumber isSC 0
 
 clean:
 	rm -f *.pos