From f065f6f2e26fafb875bba1f6aebac75b7e860413 Mon Sep 17 00:00:00 2001 From: Jeff Baylor Date: Fri, 26 Apr 2019 15:45:50 -0700 Subject: [PATCH 1/4] removed exerimental gmsh flag Mesh.CharacteristicLengthFromCurvature --- pycalculix/feamodel.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pycalculix/feamodel.py b/pycalculix/feamodel.py index 2af75c3..6e1a71c 100644 --- a/pycalculix/feamodel.py +++ b/pycalculix/feamodel.py @@ -1779,7 +1779,8 @@ def __mesh_gmsh(self, size, meshmode, timeout=20): geo.append('Mesh.CharacteristicLengthMin = 0;') geo.append('Mesh.CharacteristicLengthMax = 1e+022;') # use this so small circles are meshed finely - geo.append('Mesh.CharacteristicLengthFromCurvature = 1;') + # this is broken in Gmsh 4.3.0 + # geo.append('Mesh.CharacteristicLengthFromCurvature = 1;') geo.append('Mesh.CharacteristicLengthFromPoints = 1;') # geo.append('Mesh.Algorithm = 2; //delauny') #okay for quads geo.append('Mesh.Algorithm = 8; //delquad = delauny for quads') From a42446df95a9defaedd44768e7c2b7f3914a25fb Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 1 Jul 2019 09:36:10 -0700 Subject: [PATCH 2/4] CHANGES.md separated from readme --- CHANGES.md | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 124 ---------------------------------------------------- 2 files changed, 125 insertions(+), 124 deletions(-) create mode 100644 CHANGES.md diff --git a/CHANGES.md b/CHANGES.md new file mode 100644 index 0000000..2ff5764 --- /dev/null +++ b/CHANGES.md @@ -0,0 +1,125 @@ +## Change Log + +#### 1.1.3 (Unreleased) +- Removes gmsh exerimental flag Mesh.CharacteristicLengthFromCurvature + +#### 1.1.2 +- Sets part.left/right/top/bottom using geometry.ACC constant, tests added +- Fixes issue https://github.com/spacether/pycalculix/issues/57 where part.left + was not being set if a line was slightly skewed +- Fixes a mac install issue where gcc@7 was assuming a specific X.X.X version + of gcc7 + +#### 1.1.1 +- Omits test_pinned_plate from Mac OS X with Python >= 3.6 because it does not +converge in ccx + +#### 1.1.0 +- Adds Microsoft Azure continuous integration tests to verify that the library is working. The following environments are tested: + - Windows Server 2016 (x64 and x86 architecture) + - Mac OS X (x64) + - Ubuntu 16.04 (x64) +- Fixes a bug where cad files could not be loaded if they had a period in their path + +#### 1.0.0 +- Fixes the issue where the windows FEA installer hangs: + https://github.com/spacether/pycalculix/issues/47 +- Fixes the issue where the ccx version check in Windows fails + https://github.com/spacether/pycalculix/issues/48 +- Fixes the issue on OS X High Sierra where ccx assumes that the host has gcc7 + installed on it: https://github.com/spacether/pycalculix/issues/50 + - Solution: install gcc@7 and symbolic link it to the expected location + + +#### 0.9.6 +- Fixes part.fillet_lines method, all tests now pass + - Verified on Mac OS X + - Closes github Issue 32: '2/15 of the tests fail' + +#### 0.9.5 (github + pypi) +- Adds tests: sample tests at tests/test_samples.py +- Adds tests: meshing tests at tests/test_meshing.py +- Adds solving and meshing timeout exception to capture when they hang +- Fixes dxf import feature, syntax updates to use dfxgrabber >= 0.8.0, + Issue 32 +- Adds requirement for dfxgrabber >= 0.8.0 to ensure that dxf import works +- Pegs Mac gmsh version to gmsh == 3.0.5 because version 3.0.6 + throws segault errors when meshing +- Fixes a bug where solver input file does not write material before + time steps, Issue 32 +- Fixed ccx installer on Windows: zip file is now found and + downloaded +- Throws an exception if ccx version is too old, v 2.7 and earlier is + too old +- Pegs Win gmsh install version to 3.0.5 +- Updates the calculation for element Seqv, S1, S2, and S3 avg max + and min values. Now calculates Seqv and principal stresses at all + integration points, then calculates the avg max and min of those + values +- Win pegged ccx to version 2.12 +- Mac brew brewsci/science/calculix-ccx is currently at ccx version 2.13 +- Ubuntu apt-get calculix-ccx is currently is currently at version 2.11 + +#### 0.9.4 (github only) +- removed gmsh and calculix +- moved dist and documentation building and example cleanup into make + file +- changed the license to Apache 2.0 +- added command line tool to install/uninstall gmsh and ccx for + windows/mac os x/ubuntu + - pycalculix-add-feaprograms + - pycalculix-remove-feaprograms +- added requests library requirement for pycalculix-add-feaprograms +- fixed bug where frd files could no longer be read because Calculix + results keywords changed since initial 2014 release + +#### 0.9.3 +- ADDED: multiple parts with contacts + - See example files: pipe-crush-elastic.py, pinned-plate.py +- ADDED: Import CAD geometry from dxf file + - See pycalculix.CadImporter + - Examples: + - import-dxf.py +- ADDED: Element results plotting added + - Element results plotting: pycalculix.Problem.rfile.eplot() + - Nodal results plotting: pycalculix.Problem.rfile.nplot() + - Number Formatting: + - Strain results now use scientific formatting + - Others use nearest 10**3 suffixes + - Max and min values now listed above the colorbar +- ADDED: method to draw an arc by swept angle in degrees + - part.draw_arc_angle(degrees_ccw, center_x, center_y) +- ADDED: min_val and max_val can now be passed to eplot and nplot + - This lets the user set the results range that they want to see: + - min_val <= colored results <= max_val + - Values under and over are greyed out, darker under, lighter over +- ADDED: internal holes in parts + - One can make circular holes, or draw complicated holes. + - See examples: + - hole-in-plate-full.py, multihole.py +- ADDED: Added set_ediv method to FeaModel class. + - This method sets the number of elements on a line. + - line.set_ediv still works. +- ADDED: Robust selection object: feamodel.view + - This object is feamodel.view Most important methods are: + - view.select_all, view.select, view.allsel_under + - All plotting now uses the current selection set + - SYNTAX: updated how parts, materials, problems are made + - Make part: + - pycalculix.FeaModel.make_part or pycalculix.Part + - Make material: + - pycalculix.FeaModel.make_matl or pycalculix.Material + - Make problem (previously called model): + - pycalculix.FeaModel.make_problem or pycalculix.Problem + - Make Results File: + - pycalculix.Problem.rfile or pycalculix.ResultsFile(problem) +- FIX: Plotting fix, closing triangles in the correct direction in + matplotlib +- DOC: All code separated into modules for clarity. +- DOC: Docstrings added to all classes + methods + functions +- PLOTTING: Closed areas are now filled in yellow when plotting + geometry. +- PLOTTING: Signed line names are shown and internal to the area. +- BACKEND: Implemented signed line and signed arc class. + - Pressures can now be applied on these signed lines. + - Many methods and variables made private to clean up name space. \ No newline at end of file diff --git a/README.md b/README.md index 53739d5..ead65a3 100644 --- a/README.md +++ b/README.md @@ -227,128 +227,4 @@ See LICENSE.txt (Apache 2.0) Justin Black, justin.a.black[at-sign]gmail[dot]com Initial Release: December 2014 - -## Change Log - -#### 1.1.2 -- Sets part.left/right/top/bottom using geometry.ACC constant, tests added -- Fixes issue https://github.com/spacether/pycalculix/issues/57 where part.left - was not being set if a line was slightly skewed -- Fixes a mac install issue where gcc@7 was assuming a specific X.X.X version - of gcc7 - -#### 1.1.1 -- Omits test_pinned_plate from Mac OS X with Python >= 3.6 because it does not -converge in ccx - -#### 1.1.0 -- Adds Microsoft Azure continuous integration tests to verify that the library is working. The following environments are tested: - - Windows Server 2016 (x64 and x86 architecture) - - Mac OS X (x64) - - Ubuntu 16.04 (x64) -- Fixes a bug where cad files could not be loaded if they had a period in their path - -#### 1.0.0 -- Fixes the issue where the windows FEA installer hangs: - https://github.com/spacether/pycalculix/issues/47 -- Fixes the issue where the ccx version check in Windows fails - https://github.com/spacether/pycalculix/issues/48 -- Fixes the issue on OS X High Sierra where ccx assumes that the host has gcc7 - installed on it: https://github.com/spacether/pycalculix/issues/50 - - Solution: install gcc@7 and symbolic link it to the expected location - - -#### 0.9.6 -- Fixes part.fillet_lines method, all tests now pass - - Verified on Mac OS X - - Closes github Issue 32: '2/15 of the tests fail' - -#### 0.9.5 (github + pypi) -- Adds tests: sample tests at tests/test_samples.py -- Adds tests: meshing tests at tests/test_meshing.py -- Adds solving and meshing timeout exception to capture when they hang -- Fixes dxf import feature, syntax updates to use dfxgrabber >= 0.8.0, - Issue 32 -- Adds requirement for dfxgrabber >= 0.8.0 to ensure that dxf import works -- Pegs Mac gmsh version to gmsh == 3.0.5 because version 3.0.6 - throws segault errors when meshing -- Fixes a bug where solver input file does not write material before - time steps, Issue 32 -- Fixed ccx installer on Windows: zip file is now found and - downloaded -- Throws an exception if ccx version is too old, v 2.7 and earlier is - too old -- Pegs Win gmsh install version to 3.0.5 -- Updates the calculation for element Seqv, S1, S2, and S3 avg max - and min values. Now calculates Seqv and principal stresses at all - integration points, then calculates the avg max and min of those - values -- Win pegged ccx to version 2.12 -- Mac brew brewsci/science/calculix-ccx is currently at ccx version 2.13 -- Ubuntu apt-get calculix-ccx is currently is currently at version 2.11 - -#### 0.9.4 (github only) -- removed gmsh and calculix -- moved dist and documentation building and example cleanup into make - file -- changed the license to Apache 2.0 -- added command line tool to install/uninstall gmsh and ccx for - windows/mac os x/ubuntu - - pycalculix-add-feaprograms - - pycalculix-remove-feaprograms -- added requests library requirement for pycalculix-add-feaprograms -- fixed bug where frd files could no longer be read because Calculix - results keywords changed since initial 2014 release - -#### 0.9.3 -- ADDED: multiple parts with contacts - - See example files: pipe-crush-elastic.py, pinned-plate.py -- ADDED: Import CAD geometry from dxf file - - See pycalculix.CadImporter - - Examples: - - import-dxf.py -- ADDED: Element results plotting added - - Element results plotting: pycalculix.Problem.rfile.eplot() - - Nodal results plotting: pycalculix.Problem.rfile.nplot() - - Number Formatting: - - Strain results now use scientific formatting - - Others use nearest 10**3 suffixes - - Max and min values now listed above the colorbar -- ADDED: method to draw an arc by swept angle in degrees - - part.draw_arc_angle(degrees_ccw, center_x, center_y) -- ADDED: min_val and max_val can now be passed to eplot and nplot - - This lets the user set the results range that they want to see: - - min_val <= colored results <= max_val - - Values under and over are greyed out, darker under, lighter over -- ADDED: internal holes in parts - - One can make circular holes, or draw complicated holes. - - See examples: - - hole-in-plate-full.py, multihole.py -- ADDED: Added set_ediv method to FeaModel class. - - This method sets the number of elements on a line. - - line.set_ediv still works. -- ADDED: Robust selection object: feamodel.view - - This object is feamodel.view Most important methods are: - - view.select_all, view.select, view.allsel_under - - All plotting now uses the current selection set - - SYNTAX: updated how parts, materials, problems are made - - Make part: - - pycalculix.FeaModel.make_part or pycalculix.Part - - Make material: - - pycalculix.FeaModel.make_matl or pycalculix.Material - - Make problem (previously called model): - - pycalculix.FeaModel.make_problem or pycalculix.Problem - - Make Results File: - - pycalculix.Problem.rfile or pycalculix.ResultsFile(problem) -- FIX: Plotting fix, closing triangles in the correct direction in - matplotlib -- DOC: All code separated into modules for clarity. -- DOC: Docstrings added to all classes + methods + functions -- PLOTTING: Closed areas are now filled in yellow when plotting - geometry. -- PLOTTING: Signed line names are shown and internal to the area. -- BACKEND: Implemented signed line and signed arc class. - - Pressures can now be applied on these signed lines. - - Many methods and variables made private to clean up name space. - ![Analytics](https://ga-beacon.appspot.com/UA-97855011-1/pycalculix_github?pixel) From 3dd2af2f02f01b6e67ba4d770277da58edcc1a60 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 1 Jul 2019 10:04:56 -0700 Subject: [PATCH 3/4] Adds a link from the readme to the changes.md file --- README.md | 4 ++++ pycalculix/geometry.py | 2 +- pycalculix/version.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ead65a3..78bd7e8 100644 --- a/README.md +++ b/README.md @@ -227,4 +227,8 @@ See LICENSE.txt (Apache 2.0) Justin Black, justin.a.black[at-sign]gmail[dot]com Initial Release: December 2014 + +## Changes +[See the change log](CHANGES.md) + ![Analytics](https://ga-beacon.appspot.com/UA-97855011-1/pycalculix_github?pixel) diff --git a/pycalculix/geometry.py b/pycalculix/geometry.py index 52d3756..0947ae2 100644 --- a/pycalculix/geometry.py +++ b/pycalculix/geometry.py @@ -644,7 +644,7 @@ def intersects(self, other): return None elif isinstance(other, Arc) or isinstance(other, SignArc): # arc line intersection - return other.instersects(self) + return other.intersects(self) def __str__(self): """Returns string listing object type, name, and points""" diff --git a/pycalculix/version.py b/pycalculix/version.py index 72f26f5..0b2f79d 100644 --- a/pycalculix/version.py +++ b/pycalculix/version.py @@ -1 +1 @@ -__version__ = "1.1.2" +__version__ = "1.1.3" From 52b20ce7f7b54fd11486f77a680d1145aa9b1e48 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Sat, 30 Nov 2019 13:02:28 -0800 Subject: [PATCH 4/4] Updates changes.md --- CHANGES.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 2ff5764..f422e37 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,7 +1,8 @@ ## Change Log -#### 1.1.3 (Unreleased) +#### 1.1.3 - Removes gmsh exerimental flag Mesh.CharacteristicLengthFromCurvature +- Fixes typo in geometry.py #### 1.1.2 - Sets part.left/right/top/bottom using geometry.ACC constant, tests added