Update basic test, and new json interface

misc path

misc

Author: jiangzhongshi

.clang-format

@@ -2,10 +2,9 @@
 # https://clang.llvm.org/docs/ClangFormatStyleOptions.html
 Language: Cpp
 BasedOnStyle: LLVM
-# ColumnLimit: 80
-ColumnLimit: 0
-UseTab: ForContinuationAndIndentation
-IndentWidth: 4
+ColumnLimit: 80
+UseTab: Never
+IndentWidth: 2
 TabWidth: 4
 BreakBeforeBraces: Custom
 BraceWrapping:

cmake/recipes/polyfem.cmake

@@ -11,7 +11,7 @@ include(FetchContent)
 FetchContent_Declare(
     polyfem
     GIT_REPOSITORY https://github.com/polyfem/polyfem.git
-    GIT_TAG ea0e5cc25f2ffba64ea47225cf106460935cda5f
+    GIT_TAG 12ac634833f91a3946cff26db01972fdb2ec3214
     GIT_SHALLOW FALSE
 )
 FetchContent_MakeAvailable(polyfem)

cmake/recipes/polyfem_data.cmake

@@ -9,7 +9,7 @@ FetchContent_Declare(
     GIT_REPOSITORY https://github.com/polyfem/polyfem-data
     GIT_TAG 29a46df1fd90c237a82c219f346a956e72bd17d3
     GIT_SHALLOW FALSE
-    SOURCE_DIR ${POLYFEMPY_DATA_ROOT}/data
+    SOURCE_DIR ${POLYFEMPY_DATA_ROOT}
 )
 FetchContent_GetProperties(polyfem_data)
 if(NOT polyfem_data_POPULATED)

polyfempy/Settings.py

@@ -1,6 +1,7 @@
 import json
+from logging import raiseExceptions
 import polyfempy
-
+import sys
 
 class Settings:
     """Class that encodes the settings of the solver, it models the input json file"""
@@ -38,6 +39,7 @@ def __init__(self, discr_order=1, pressure_discr_order=1, pde=polyfempy.PDEs.Lap
         self.pde = pde
 
         self.selection = None
+        raise RuntimeError("Old Version Deprecated. Use version <0.5.2 on conda for the old interface")
 
     def get_problem(self):
         """Get the problem"""
@@ -141,7 +143,9 @@ def __str__(self):
         tmp["problem"] = self.problem
         tmp.update(self.advanced_options)
 
-        return json.dumps(tmp, sort_keys=True, indent=4)
+        json_str = json.dumps(tmp, sort_keys=True, indent=4)
+
+        return json_str
 
     def serialize(self):
         """stringyfied json description of this class, used to run the solver"""

polyfempy/test/test_pythonic.py

@@ -35,10 +35,13 @@ def sideset(p):
             vertices=pts,
             cells=faces,
             sidesets_func=sideset,
-            diriclet_bc=[{"id": 4, "value": [0, 0]}],
-            materials=[{"id": 0, "E": 2100, "nu": 0.3}],
-            rhs=[0, 0.1],
-            discr_order=1
+            boundary_conditions=dict(
+                dirichlet_boundary=[dict(id=4, value=[0, 0])],
+                rhs=[0, 0.1],
+            ),
+            geometry="",
+            materials=[dict(type="NeoHookean", id=0, E=2100, nu=0.3)],
+            space=dict(discr_order=1),
         )
 
         log = solver.get_log()

setup.py

@@ -29,7 +29,7 @@ def run(self):
             raise RuntimeError(
                 "CMake must be installed to build the following extensions: , ".join(e.name for e in self.extensions))
 
-        # self.debug = True
+        self.debug = True
 
         cmake_version = LooseVersion(
             re.search(r'version\s*([\d.]+)', out.decode()).group(1))
@@ -78,7 +78,7 @@ def build_extension(self, ext):
             build_args += ['--', '-j{}'.format(n_threads)]
 
         env = os.environ.copy()
-        env['CXXFLAGS'] = '{} -DVERSION_INFO=\\"{}\\"'.format(
+        env['CXXFLAGS'] = '{} -DVERSION_INFO=\"{}\"'.format(
             env.get('CXXFLAGS', ''), self.distribution.get_version())
 
         if not os.path.exists(self.build_temp):
@@ -98,7 +98,7 @@ def build_extension(self, ext):
 
 setup(
     name="polyfempy",
-    version="0.6",
+    version="0.7",
     author="Teseo Schneider",
     author_email="",
     description="Polyfem Python Bindings",