Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
185 commits
Select commit Hold shift + click to select a range
c8b756a
Initial commit
lmdiazangulo Aug 8, 2023
e79d207
Initial commit
lmdiazangulo Aug 8, 2023
d89608d
Fixes test organization
lmdiazangulo Aug 9, 2023
e515185
Minor
lmdiazangulo Aug 9, 2023
f99b4c4
token
lmdiazangulo Aug 9, 2023
719790d
token
lmdiazangulo Aug 9, 2023
68c5e29
Testing keys
lmdiazangulo Aug 9, 2023
57217f0
Retrying
lmdiazangulo Aug 9, 2023
c720fcc
Adding tests to CI
lmdiazangulo Aug 9, 2023
520a943
Changing order
lmdiazangulo Aug 9, 2023
c307978
Fixing
lmdiazangulo Aug 9, 2023
e55cdbe
Minor
lmdiazangulo Aug 9, 2023
784b44b
minor2
lmdiazangulo Aug 9, 2023
9d702cf
Minor3
lmdiazangulo Aug 9, 2023
2a93f0c
Fixing requirements
lmdiazangulo Aug 9, 2023
f6df782
Fix test discovery
lmdiazangulo Aug 9, 2023
3a2c0fe
Cache fix
lmdiazangulo Aug 9, 2023
d57a60d
minor
lmdiazangulo Aug 9, 2023
4b20844
Testing cache
lmdiazangulo Aug 9, 2023
6c35923
cache
lmdiazangulo Aug 9, 2023
92ce0b5
Adds Github action for testing
lmdiazangulo Aug 9, 2023
d954d2e
Merge branch 'master' of github.com:lmdiazangulo/step2gmsh
lmdiazangulo Aug 9, 2023
15793cb
Minor for status badge
lmdiazangulo Aug 9, 2023
b14b729
Removes unused workflow
lmdiazangulo Aug 9, 2023
788177e
MInor
lmdiazangulo Aug 9, 2023
e35aa36
[WIP] Adding open boundary meshing.
lmdiazangulo Aug 11, 2023
2ca396c
Merge branch 'master' into dev
lmdiazangulo Aug 12, 2023
445a73b
MInor
lmdiazangulo Aug 12, 2023
4172148
Minor
lmdiazangulo Aug 12, 2023
8cbb706
Dev (#3)
lmdiazangulo Aug 12, 2023
75ed7c3
Removes entities not in physical groups
lmdiazangulo Aug 28, 2023
b4d7354
Removes size max from default options
lmdiazangulo Aug 28, 2023
23a609f
Enlarges boundary for open problem
lmdiazangulo Aug 28, 2023
d3e7e50
Merge pull request #4 from lmdiazangulo/dev
lmdiazangulo Aug 28, 2023
05f04a4
[WIP] Implementing subdomains
lmdiazangulo Sep 7, 2023
41695bb
Improving tests to check correct number of entities
lmdiazangulo Sep 8, 2023
6a0b53a
Debugging
lmdiazangulo Sep 8, 2023
f904a4b
All test pass
lmdiazangulo Sep 8, 2023
cee6c8e
Fixes issue with vacuum domain
lmdiazangulo Sep 8, 2023
a6e2472
Merge pull request #5 from lmdiazangulo/dev
lmdiazangulo Sep 8, 2023
bb0572b
Adds two wires open case
lmdiazangulo Sep 19, 2023
205960c
Adds semi-open problem meshing capability.
lmdiazangulo Sep 25, 2023
58b1724
Removal of entities not in physical group is now recursive
lmdiazangulo Sep 26, 2023
e1ca7bc
Boundaries are now ensured to be part of vacuum manifold.
lmdiazangulo Sep 26, 2023
12aa10d
Minor in actions
lmdiazangulo Sep 26, 2023
4473b7f
Merge pull request #6 from OpenSEMBA/dev
lmdiazangulo Sep 26, 2023
af2b85f
Minor changes in names
lmdiazangulo Oct 18, 2023
365a8d8
Fix issue w/ open boundaries in semi-open case
lmdiazangulo Oct 20, 2023
c126a75
Adds launcher
lmdiazangulo Feb 26, 2024
f4e4957
Adds documentation
lmdiazangulo Feb 26, 2024
8289f87
License updates
lmdiazangulo Feb 27, 2024
fbb21c1
Adds vtk exporting when run from input
lmdiazangulo Mar 1, 2024
ac28a8a
New tests and fixed problem with int boundaries
AlejandroMunozManterola May 29, 2024
4a84ac3
Merge pull request #7 from OpenSEMBA/alejandro
lmdiazangulo May 29, 2024
437ad76
Merge branch 'dev' into update-dev-to-main
adrianarce-elemwave Apr 29, 2025
3983c65
Merge pull request #8 from OpenSEMBA/update-dev-to-main
adrianarce-elemwave Apr 29, 2025
4865889
Defined OpenMultiwireClass
adrianarce-elemwave Apr 30, 2025
8edcb84
Added bounding box from group
adrianarce-elemwave May 2, 2025
c550538
Implemented open case check
adrianarce-elemwave May 2, 2025
9613c92
Added methods for building open and closed vacuum domains
adrianarce-elemwave May 2, 2025
ad5992c
Major refactor of mesher.py into different class files
adrianarce-elemwave May 5, 2025
3dd46fb
Fix issue with openCase validation
adrianarce-elemwave May 5, 2025
7a352f9
Refactored test files
adrianarce-elemwave May 5, 2025
1843a35
Added numpy to requirements.txt
adrianarce-elemwave May 5, 2025
5dbb908
Minor issue with import in step2gmsh.py
adrianarce-elemwave May 5, 2025
fd08b87
Merge pull request #10 from OpenSEMBA/feature/unshielded-multiwires
lmdiazangulo May 6, 2025
6593d91
[WIP] Support OpenRegions and automatic open regions.
lmdiazangulo May 12, 2025
c4d87c0
Passes tests, preserving defined OpenRegions and defining new ones wh…
lmdiazangulo May 12, 2025
d232c1a
Renames OpenRegion to OpenBoundary
lmdiazangulo May 12, 2025
f62ea22
Add 'dev' branch to push and pull_request triggers in tests.yml
lmdiazangulo May 12, 2025
1a38fb2
Merge pull request #11 from OpenSEMBA/feature/unshielded-multiwires
lmdiazangulo May 12, 2025
b17a052
Compute coonductor area
adrianarce-elemwave May 12, 2025
f9e6ec9
Renamed test files to ensure actions detects them. Fixed minor bug wi…
adrianarce-elemwave May 14, 2025
759ce83
PR minor changes
adrianarce-elemwave May 16, 2025
2f7aa7e
Merge pull request #12 from OpenSEMBA/feature/create-area-file
lmdiazangulo May 16, 2025
682efb0
Changes near vacuum to a rectangle
lmdiazangulo May 24, 2025
561b8ca
Minor
lmdiazangulo May 26, 2025
775558c
adds one more test case
lmdiazangulo May 28, 2025
2882872
Merge pull request #13 from OpenSEMBA/feature/unshielded-multiwires
lmdiazangulo May 28, 2025
5f7d670
Merge pull request #14 from OpenSEMBA/dev
lmdiazangulo May 28, 2025
5398c3a
Makes near region bounding box smaller to improve compatibility with …
lmdiazangulo Jul 3, 2025
7023e69
Forces specific version of gmsh
lmdiazangulo Jul 4, 2025
6a7f2ca
Merge pull request #15 from OpenSEMBA/feature/unshielded-multiwires
lmdiazangulo Jul 4, 2025
4799740
Merge pull request #16 from OpenSEMBA/dev
lmdiazangulo Jul 4, 2025
073aef3
Minor | Restricted numpy versions
adrianarce-elemwave Jul 9, 2025
f4c26b4
Minor | Added no-cache flag to workflow
adrianarce-elemwave Jul 9, 2025
20beda5
Merge pull request #17 from OpenSEMBA/dependency-requirements-change
adrianarce-elemwave Jul 9, 2025
755322b
Merge pull request #18 from OpenSEMBA/dev
adrianarce-elemwave Jul 9, 2025
2044e2e
Changes internal bounding box to 25% larger from 20%.
lmdiazangulo Sep 5, 2025
ce40089
Adds test with issue for certain dielectrics.
lmdiazangulo Sep 5, 2025
60ce097
Refactor vacuum domain handling and update expected names in tests
lmdiazangulo Sep 5, 2025
f9e468a
Fixes dielectric ring case
lmdiazangulo Sep 8, 2025
cb177a3
Merge pull request #19 from OpenSEMBA/feature/unshielded-multiwires
lmdiazangulo Sep 8, 2025
afcd50d
Change ShapeClassification to check for json data
adrianarce-elemwave Sep 30, 2025
c0c2e57
Added graph for pecs in Shape Classification
adrianarce-elemwave Oct 1, 2025
304dabd
Added json files
adrianarce-elemwave Oct 2, 2025
8472cfc
Add label to exported json
adrianarce-elemwave Oct 2, 2025
98ee095
Changed physical model to use mapped graph
adrianarce-elemwave Oct 2, 2025
f817b9e
minor, assertion fix
adrianarce-elemwave Oct 2, 2025
0aa8466
Merge pull request #22 from OpenSEMBA/21-change-step2gmsh-input-reque…
lmdiazangulo Oct 2, 2025
0c965a3
Adds realistic bundle case
lmdiazangulo Oct 12, 2025
78c6258
Reverts order 1 to order 3.
lmdiazangulo Oct 13, 2025
cc1a97d
Includes test to check that there are no duplicate nodes.
lmdiazangulo Oct 13, 2025
f9de401
Add duplicate node checks in mesh tests
lmdiazangulo Oct 13, 2025
545c816
Fixes problem with duplicated nodes
lmdiazangulo Oct 13, 2025
bde2f5b
Minor | Added complex nested cas and updated doc
adrianarce-elemwave Oct 14, 2025
5806255
Changes near region size to 1.15
lmdiazangulo Oct 15, 2025
1dcf29b
[WIP] Possibility of defining open boundary
lmdiazangulo Oct 15, 2025
d1680ad
Refactor vacuum domain handling and update physical model construction
lmdiazangulo Oct 15, 2025
46802b5
Debugging issue with dielectrics
lmdiazangulo Oct 16, 2025
06768d4
Fixes problem reading layers with more than one entity
lmdiazangulo Oct 16, 2025
c80ddcd
refactors getters
lmdiazangulo Oct 16, 2025
b4e5483
Minor | Readme update
adrianarce-elemwave Oct 16, 2025
2da30d4
[WIP] Ensuring conductor areas are computed correctly
lmdiazangulo Oct 16, 2025
297b191
Merge pull request #24 from OpenSEMBA/minor-add-nested-test-and-updat…
lmdiazangulo Oct 16, 2025
f82fe1a
[WIP] Ensuring conductor areas are computed correctly
lmdiazangulo Oct 16, 2025
277e036
[WIP] Testing area exporting for just conductors of general shape
lmdiazangulo Oct 16, 2025
12c17e4
Fixes merge
lmdiazangulo Oct 17, 2025
ae81022
Passes tests
lmdiazangulo Oct 17, 2025
21f9f47
Merge remote-tracking branch 'origin/dev' into realistic-case
lmdiazangulo Oct 17, 2025
a9463f3
Merge pull request #23 from OpenSEMBA/realistic-case
lmdiazangulo Oct 17, 2025
a921bc7
Add unshielded single wire test data files in FreeCAD and STEP formats
lmdiazangulo Mar 12, 2026
840b529
Adds unshielded single wire test
lmdiazangulo Mar 12, 2026
c4174dc
Merge pull request #27 from OpenSEMBA/unshielded-single-wire
lmdiazangulo Mar 12, 2026
b46c9be
Extra test for unshielded
lmdiazangulo Mar 20, 2026
88ef4da
Merge remote-tracking branch 'step2gmsh_origin/dev' into 58-major-red…
lmdiazangulo Mar 23, 2026
7aa8c81
Update branch references from master to main in workflow files and ad…
lmdiazangulo Mar 23, 2026
c071bf9
Minor
lmdiazangulo Mar 24, 2026
c397ce5
Moves step2gmsh into separate folder
lmdiazangulo Mar 24, 2026
4502b3b
Converts step2gmsh from python to c++
lmdiazangulo Mar 24, 2026
5f781d1
Reorganizing
lmdiazangulo Mar 24, 2026
ca50814
Minor
lmdiazangulo Mar 24, 2026
a6803f6
Add VCPKG overlay triplet configuration for GNU g++ compiler
lmdiazangulo Mar 25, 2026
4a33532
Add install-packages.sh script to automate package installation for v…
lmdiazangulo Mar 25, 2026
b96460b
Refactor GitHub Actions workflow to streamline package installation a…
lmdiazangulo Mar 25, 2026
6657259
Removes threads
lmdiazangulo Mar 25, 2026
dfc656e
Add 'build' directory to .gitignore
lmdiazangulo Mar 26, 2026
142edc2
Add launch configuration for gdb debugging of adapter_tests, pulmtln_…
lmdiazangulo Mar 26, 2026
6756264
Add test for unshielded two wires with touching dielectric and update…
lmdiazangulo Mar 26, 2026
25d9913
Update vcpkg Git commit ID in workflow configuration
lmdiazangulo Mar 26, 2026
75f9ef1
Refactor workflow and update build configurations for TULIP; add vcpk…
lmdiazangulo Mar 26, 2026
f7f3f6e
Adds mesapacakge for glx.h
lmdiazangulo Mar 26, 2026
b41767c
Renames tests for consistency
lmdiazangulo Mar 26, 2026
5f1808f
Fixing mesher tests
lmdiazangulo Mar 26, 2026
271cdfb
two_wires_open passes
lmdiazangulo Mar 26, 2026
93ceee8
Tests pass. Agrawal changed to a closed case.
lmdiazangulo Mar 27, 2026
a252b58
Reorganizing repo and drafting new data formats.
lmdiazangulo Mar 27, 2026
fda7d84
Update build configurations for TULIP and PULMTLN workflows
lmdiazangulo Mar 27, 2026
f36bb7f
Enhance documentation for Tulip input data format, clarifying options…
lmdiazangulo Mar 27, 2026
5171cd9
Fix Windows build error: add missing <algorithm> include in GraphTest…
Copilot Mar 27, 2026
14514e8
Addreses comments and fixes typos
lmdiazangulo Mar 29, 2026
e0f70ad
Update .gitignore and CMakeLists for test configurations
lmdiazangulo Mar 30, 2026
406ab6d
Merge remote-tracking branch 'origin/58-major-redesign' into new-data…
lmdiazangulo Mar 30, 2026
5bbec47
Reorganizing repo
lmdiazangulo Mar 30, 2026
6cacb6b
Renaming as tulip
lmdiazangulo Mar 30, 2026
b5086fd
Refactoring
lmdiazangulo Mar 30, 2026
4fe1b2d
Merge pull request #61 from OpenSEMBA/new-data-formats
lmdiazangulo Mar 30, 2026
6ece1ce
[WIP] Reorganizing adapter.
lmdiazangulo Mar 30, 2026
fc5fc4e
Adds agrawal file
lmdiazangulo Mar 30, 2026
7550882
Update .gitignore and refactor Materials class structure
lmdiazangulo Mar 30, 2026
132b0d1
Fixing windows action
lmdiazangulo Mar 30, 2026
39831af
Changes in action
lmdiazangulo Mar 31, 2026
d8336ae
Redesigning
lmdiazangulo Mar 31, 2026
ba71fdc
Refactor Materials class and update main function comments for clarity
lmdiazangulo Mar 31, 2026
8107016
Add AdaptedInputParser class and update CMakeLists for new directories
lmdiazangulo Mar 31, 2026
74440a3
refactoring
lmdiazangulo Mar 31, 2026
a65dca1
[WIP] Refactoring
lmdiazangulo Apr 1, 2026
0bfff06
Fixes compilation issues
lmdiazangulo Apr 1, 2026
b473c12
Refactor Driver, Model, and Materials classes for improved material h…
lmdiazangulo Apr 1, 2026
82326b0
Merge remote-tracking branch 'origin/58-major-redesign' into reorgani…
lmdiazangulo Apr 1, 2026
7867c6f
Trying to compile
lmdiazangulo Apr 2, 2026
9554650
Compiles
lmdiazangulo Apr 2, 2026
7cfe2e1
Rename meshFromStep to meshFromInput and update related tests for con…
lmdiazangulo Apr 2, 2026
7864434
WIP new format
lmdiazangulo Apr 2, 2026
25144cb
Refactor empty coax JSON configurations: update materials structure a…
lmdiazangulo Apr 2, 2026
54a2991
Refactor shielded adapter tests
lmdiazangulo Apr 2, 2026
a81f15b
Shielded cases are now adapted
lmdiazangulo Apr 2, 2026
6e2b323
[WIP] Refactoring
lmdiazangulo Apr 3, 2026
217222c
[WIP] Reaviewing adapter tests
lmdiazangulo Apr 3, 2026
50dd923
Changes everywhere
lmdiazangulo Apr 3, 2026
1760a6e
converts dielectric_unshielded_pair
lmdiazangulo Apr 3, 2026
5e92665
All adapter test pass
lmdiazangulo Apr 3, 2026
a725408
Reviewed testData
lmdiazangulo Apr 4, 2026
0a7f6ac
Reviewing adapted files
lmdiazangulo Apr 4, 2026
11fb149
Adapter test pass. Some driver test pass
lmdiazangulo Apr 4, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
2 changes: 1 addition & 1 deletion .github/workflows/create-dist.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cd pulmtln
cd tulip
md "dist\"
xcopy "build\bin\Release\" "dist\" /e
cd ..
40 changes: 22 additions & 18 deletions .github/workflows/ubuntu-builds-and-tests.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: "Ubuntu | Build and tests"
name: "Ubuntu | Tulip build and tests"

permissions:
actions: write

on:
push:
branches:
- master
- main
- dev
pull_request:
branches:
Expand All @@ -15,7 +15,7 @@ on:
workflow_dispatch:

env:
PULMTLN_TOP_DIR: pulmtln
TULIP_TOP_DIR: tulip
MFEM_TOP_DIR: mfem

jobs:
Expand All @@ -30,33 +30,37 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- name: checkout PULMTLN
- name: checkout TULIP
uses: actions/checkout@v3
with:
path: ${{ env.PULMTLN_TOP_DIR }}
path: ${{ env.TULIP_TOP_DIR }}
ssh-key: ${{secrets.PULMTLN_SSH_KEY}}
submodules: 'recursive'

- name: getcmake
uses: lukka/get-cmake@latest

- name: Setup vcpkg (it does not install any package yet)
- name: Install system packages
run: bash ${{ env.TULIP_TOP_DIR }}/scripts/install-packages.sh

- name: Setup vcpkg
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: 42bb0d9e8d4cf33485afb9ee2229150f79f61a1f
vcpkgJsonGlob: 'pulmtln/vcpkg.json'
- name: Configuring PULMTLN
env:
MFEM_PACKAGE: ${{ github.workspace }}/${{env.MFEM_TOP_DIR}}/build
vcpkgGitCommitId: eed289f6e06a5e7a5c9e6a729671b0a56af7dd69
vcpkgJsonGlob: 'tulip/vcpkg.json'

- name: Configure TULIP
env:
MFEM_PACKAGE: ${{ github.workspace }}/${{ env.MFEM_TOP_DIR }}/build
run: |
cmake --preset "gnu" -S pulmtln -B pulmtln/build
- name: Building PULMTLN
cmake --preset "gnu" -S ${{ env.TULIP_TOP_DIR }} -B ${{ env.TULIP_TOP_DIR }}/build

- name: Build TULIP
run: |
cmake --build pulmtln/build/
cmake --build ${{ env.TULIP_TOP_DIR }}/build --parallel 2

- name: test PULMTLN
run: cd pulmtln && build/bin/pulmtln_tests
- name: Test TULIP
run: |
ctest --test-dir ${{ env.TULIP_TOP_DIR }}/build --output-on-failure


32 changes: 16 additions & 16 deletions .github/workflows/windows-automated-releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ permissions:
on:
push:
branches:
- master
- main
- feature/automate-release

env:
PULMTLN_TOP_DIR: pulmtln
TULIP_TOP_DIR: tulip
MFEM_TOP_DIR: mfem


Expand All @@ -32,10 +32,10 @@ jobs:
with:
access_token: ${{ github.token }}

- name: checkout PULMTLN
- name: checkout TULIP
uses: actions/checkout@v4
with:
path: ${{ env.PULMTLN_TOP_DIR }}
path: ${{ env.TULIP_TOP_DIR }}

- name: getcmake
uses: lukka/get-cmake@latest
Expand All @@ -44,7 +44,7 @@ jobs:
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: 120deac3062162151622ca4860575a33844ba10b
vcpkgJsonGlob: 'pulmtln/vcpkg.json'
vcpkgJsonGlob: 'tulip/vcpkg.json'

- name: cache MFEM
uses: actions/cache@v3
Expand Down Expand Up @@ -79,29 +79,29 @@ jobs:
# - name: Setup tmate session
# uses: mxschmitt/action-tmate@v3

- name: Configuring PULMTLN
- name: Configuring TULIP
env:
MFEM_PACKAGE: ${{ github.workspace }}/${{env.MFEM_TOP_DIR}}/build
run: |
cmake --preset "msbuild-vcpkg" -S pulmtln -B pulmtln/build
cmake --preset "msbuild-vcpkg" -S tulip -B tulip/build

- name: Building PULMTLN
- name: Building TULIP
run: |
cmake --build pulmtln/build/ --config Release
cmake --build tulip/build/ --config Release

# - name: Configuring and building PULMTLN
# - name: Configuring and building TULIP
# uses: lukka/run-cmake@v10
# id: runcmake

# with:
# cmakeListsTxtPath: '${{ github.workspace }}/pulmtln/CMakeLists.txt'
# cmakeListsTxtPath: '${{ github.workspace }}/tulip/CMakeLists.txt'
# configurePreset: 'msbuild-vcpkg'
# configurePresetAdditionalArgs: '[`-DCMAKE_PREFIX_PATH=../mfem`]'
# buildPreset: 'msbuild-vcpkg'
# buildPresetAdditionalArgs: '[`--config Release`]'

- name: test PULMTLN
run: cd pulmtln && build/bin/Release/pulmtln_tests.exe
- name: test TULIP
run: cd tulip && build/bin/Release/tulip_tests.exe

- name: Get current date
id: date
Expand All @@ -110,11 +110,11 @@ jobs:
- name: Create dist folder
shell: bash
run: |
${{ env.PULMTLN_TOP_DIR }}/.github/workflows/create-dist.bat
${{ env.TULIP_TOP_DIR }}/.github/workflows/create-dist.bat

- name: Create .tar file
run: |
cd pulmtln && tar -czvf tulip-windows.tar.gz dist/*
cd tulip && tar -czvf tulip-windows.tar.gz dist/*


- name: Generating release
Expand All @@ -125,4 +125,4 @@ jobs:
prerelease: false
title: "${{ steps.date.outputs.date }} Windows TULIP"
files: |
pulmtln/tulip-windows.tar.gz
tulip/tulip-windows.tar.gz
43 changes: 16 additions & 27 deletions .github/workflows/windows-builds-and-tests.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: "Windows | Build and tests"
name: "Windows | Tulip build and tests"

permissions:
actions: write

on:
push:
branches:
- master
- main
- dev
pull_request:
branches:
Expand All @@ -15,7 +15,7 @@ on:
workflow_dispatch:

env:
PULMTLN_TOP_DIR: pulmtln
TULIP_TOP_DIR: tulip
MFEM_TOP_DIR: mfem

jobs:
Expand All @@ -35,10 +35,10 @@ jobs:
with:
access_token: ${{ github.token }}

- name: checkout PULMTLN
- name: checkout TULIP
uses: actions/checkout@v3
with:
path: ${{ env.PULMTLN_TOP_DIR }}
path: ${{ env.TULIP_TOP_DIR }}
ssh-key: ${{secrets.PULMTLN_SSH_KEY}}

- name: getcmake
Expand All @@ -47,8 +47,8 @@ jobs:
- name: Setup vcpkg (it does not install any package yet)
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: 120deac3062162151622ca4860575a33844ba10b
vcpkgJsonGlob: 'pulmtln/vcpkg.json'
vcpkgGitCommitId: eed289f6e06a5e7a5c9e6a729671b0a56af7dd69
vcpkgJsonGlob: 'tulip/vcpkg.json'

- name: cache MFEM
uses: actions/cache@v3
Expand All @@ -64,7 +64,7 @@ jobs:
repository: opensemba/mfem
path: ${{ env.MFEM_TOP_DIR }}

- name: build MFEM
- name: Build MFEM
if: steps.mfem-cache.outputs.cache-hit != 'true'
uses: mfem/github-actions/build-mfem@v2.4
env:
Expand All @@ -80,28 +80,17 @@ jobs:
metis-dir: ${{ env.METIS_TOP_DIR }}
mfem-dir: ${{ env.MFEM_TOP_DIR }}

- name: Configuring PULMTLN
- name: Configure TULIP
env:
MFEM_PACKAGE: ${{ github.workspace }}/${{env.MFEM_TOP_DIR}}/build
run: |
cmake --preset "msbuild-vcpkg" -S pulmtln -B pulmtln/build
cmake --preset "msbuild-vcpkg" -S tulip -B tulip/build

- name: Building PULMTLN
- name: Build TULIP
run: |
cmake --build pulmtln/build/ --config Release

# - name: Configuring and building PULMTLN
# uses: lukka/run-cmake@v10
# id: runcmake

# with:
# cmakeListsTxtPath: '${{ github.workspace }}/pulmtln/CMakeLists.txt'
# configurePreset: 'msbuild-vcpkg'
# configurePresetAdditionalArgs: '[`-DCMAKE_PREFIX_PATH=../mfem`]'
# buildPreset: 'msbuild-vcpkg'
# buildPresetAdditionalArgs: '[`--config Release`]'

- name: test PULMTLN
run: cd pulmtln && build/bin/Release/pulmtln_tests.exe

cmake --build tulip/build/ --config Release

- name: Test TULIP
run: |
ctest --test-dir ${{ env.TULIP_TOP_DIR }}/build -C Release --output-on-failure

22 changes: 18 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.vs/
out/
build/
build*/
builds/
ParaView/
tmp_cases/
Expand All @@ -11,8 +11,6 @@ CMakeSettings.json
.vscode/c_cpp_properties.json


/*.msh

*.csv
*.gf
mesh.mesh
Expand Down Expand Up @@ -61,11 +59,27 @@ __pycache__/

/CMakeUserPresets.json

/to_from_JSONFile_test.pulmtln.out.json
/to_from_JSONFile_test.tulip.out.json
/Results
/mfem-build
/testData/lansink2024_single_wire/lansink2024_single_wire.areas.json
/testData/lansink2024_fdtd_cell/calculations.py
/testData/lansink2024/inCellPotentials.out.json
/XMLGoogleTestResults.xml
*.inCellPotentials.out.json
*.FCStd1
*.pyc
.vscode/
.pytest_cache/
.idea/
tmpFolder/
venv/
gmshDoc/
vcpkg_installed/

*.msh
*.vtk
*.areas.json
build
Testing/Temporary/CTestCostData.txt
Testing/Temporary/LastTest.log
5 changes: 1 addition & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
[submodule "external/mfem-geg"]
path = external/mfem-geg
url = https://github.com/OpenSEMBA/mfem.git
ignore = dirty
[submodule "external/step2gmsh"]
path = external/step2gmsh
url = https://github.com/OpenSEMBA/step2gmsh.git
ignore = dirty
Loading
Loading