Skip to content

Commit 1be28ed

Browse files
dcwhitedcwhite
authored
Merge branch 'master' into parserhelp-page
2 parents aa8925b + f6afe92 commit 1be28ed

File tree

713 files changed

+772
-181900
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

713 files changed

+772
-181900
lines changed

‎.github/workflows/mac.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,17 @@ jobs:
4949
name: SCIRunMacInstaller
5050
path: bin/SCIRun/SCIRun-5.0.beta.*-Darwin.pkg
5151

52-
- name: Deploy
53-
id: deploy
54-
if: github.ref == 'refs/heads/master'
55-
uses: marvinpinto/action-automatic-releases@latest
56-
with:
57-
repo_token: "${{ secrets.GITHUB_TOKEN }}"
58-
automatic_release_tag: "dev-mac"
59-
prerelease: true
60-
title: "Development Build for Mac"
61-
files: |
62-
bin/SCIRun/SCIRun-5.0.beta.*-Darwin.pkg
52+
# - name: Deploy
53+
# id: deploy
54+
# if: github.ref == 'refs/heads/master'
55+
# uses: marvinpinto/action-automatic-releases@latest
56+
# with:
57+
# repo_token: "${{ secrets.GITHUB_TOKEN }}"
58+
# automatic_release_tag: "dev-mac"
59+
# prerelease: true
60+
# title: "Development Build for Mac"
61+
# files: |
62+
# bin/SCIRun/SCIRun-5.0.beta.*-Darwin.pkg
6363

6464
mac-build-headless:
6565

‎.github/workflows/windows.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,13 @@ jobs:
120120
name: SCIRunWindowsPythonInstaller
121121
path: bin/SCIRun/SCIRun-5.0.beta.*-win64.exe
122122

123-
- name: Deploy
124-
if: github.ref == 'refs/heads/master'
125-
uses: marvinpinto/action-automatic-releases@latest
126-
with:
127-
repo_token: "${{ secrets.GITHUB_TOKEN }}"
128-
automatic_release_tag: "dev-windows"
129-
prerelease: true
130-
title: "Development Build for Windows"
131-
files: |
132-
bin/SCIRun/SCIRun-5.0.beta.*-win64.exe
123+
# - name: Deploy
124+
# if: github.ref == 'refs/heads/master'
125+
# uses: marvinpinto/action-automatic-releases@latest
126+
# with:
127+
# repo_token: "${{ secrets.GITHUB_TOKEN }}"
128+
# automatic_release_tag: "dev-windows"
129+
# prerelease: true
130+
# title: "Development Build for Windows"
131+
# files: |
132+
# bin/SCIRun/SCIRun-5.0.beta.*-win64.exe

‎src/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,6 @@ IF(BUILD_TESTING)
861861
ENDIF()
862862
ENDIF()
863863

864-
SET_PROPERTY(TARGET cleaver PROPERTY FOLDER "Externals")
865864
SET_PROPERTY(TARGET xml2 PROPERTY FOLDER "Externals")
866865

867866
IF(BUILD_WITH_PYTHON)

‎src/Core/Algorithms/Factory/HardCodedAlgorithmFactory.cc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686
#include <Core/Algorithms/BrainStimulator/GenerateROIStatisticsAlgorithm.h>
8787
#include <Core/Algorithms/BrainStimulator/SetupRHSforTDCSandTMSAlgorithm.h>
8888
#include <Core/Algorithms/BrainStimulator/SimulateForwardMagneticFieldAlgorithm.h>
89-
#include <Core/Algorithms/Field/InterfaceWithCleaverAlgorithm.h>
9089
#include <Core/Algorithms/Legacy/Fields/Mapping/ApplyMappingMatrix.h>
9190
#include <Core/Algorithms/Legacy/Fields/ClipMesh/ClipMeshBySelection.h>
9291
#include <Core/Algorithms/Legacy/Fields/FieldData/SetFieldDataToConstantValue.h>
@@ -143,7 +142,6 @@ void HardCodedAlgorithmFactory::addToMakerMap()
143142
ADD_MODULE_ALGORITHM(AddKnownsToLinearSystem, AddKnownsToLinearSystemAlgo)
144143
ADD_MODULE_ALGORITHM(CalculateVectorMagnitudes, CalculateVectorMagnitudesAlgo)
145144
ADD_MODULE_ALGORITHM(BuildFEMatrix, BuildFEMatrixAlgo)
146-
ADD_MODULE_ALGORITHM(InterfaceWithCleaver, InterfaceWithCleaverAlgorithm)
147145
ADD_MODULE_ALGORITHM(GetFieldData, GetFieldDataAlgo)
148146
ADD_MODULE_ALGORITHM(SetFieldData, SetFieldDataAlgo)
149147
ADD_MODULE_ALGORITHM(GetMatrixSlice, GetMatrixSliceAlgo)

‎src/Core/Algorithms/Field/CMakeLists.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,13 @@
2828

2929
SET(Algorithms_Field_SRCS
3030
ReportFieldInfoAlgorithm.cc
31-
InterfaceWithCleaverAlgorithm.cc
3231
InterfaceWithCleaver2Algorithm.cc
3332
CalculateNodeLocationFrequencyAlgorithm.cc
3433
RefineTetMeshLocallyAlgorithm.cc
3534
)
3635

3736
SET(Algorithms_Field_HEADERS
3837
ReportFieldInfoAlgorithm.h
39-
InterfaceWithCleaverAlgorithm.h
4038
InterfaceWithCleaver2Algorithm.h
4139
CalculateNodeLocationFrequencyAlgorithm.h
4240
RefineTetMeshLocallyAlgorithm.h
@@ -52,7 +50,6 @@ TARGET_LINK_LIBRARIES(Algorithms_Field
5250
Core_Datatypes
5351
Core_Datatypes_Legacy_Field
5452
Algorithms_Base
55-
cleaver
5653
Core_Algorithms_Legacy_Fields
5754
${SCI_BOOST_LIBRARY}
5855
${SCI_CLEAVER2_LIBRARY}

‎src/Core/Algorithms/Field/InterfaceWithCleaver2Algorithm.cc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828

2929
#include <Core/Algorithms/Field/InterfaceWithCleaver2Algorithm.h>
30-
#include <Core/Algorithms/Field/InterfaceWithCleaverAlgorithm.h>
3130
#include <Core/Algorithms/Base/AlgorithmVariableNames.h>
3231

3332
#include <cleaver2/vec3.h>

‎src/Core/Algorithms/Field/Tests/InterfaceWithCleaverAlgorithmTests.cc‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,15 @@
3131
#include <Core/Datatypes/Legacy/Field/VField.h>
3232
#include <Core/Datatypes/Legacy/Field/FieldInformation.h>
3333
#include <Core/Datatypes/Matrix.h>
34-
#include <Core/Algorithms/Field/InterfaceWithCleaverAlgorithm.h>
34+
#include <Core/Algorithms/Field/InterfaceWithCleaver2Algorithm.h>
35+
#include <Core/Algorithms/Base/AlgorithmVariableNames.h>
3536
#include <Testing/Utils/SCIRunUnitTests.h>
3637
#include <Core/Datatypes/DenseMatrix.h>
3738

3839
using namespace SCIRun;
3940
using namespace SCIRun::Core::Datatypes;
4041
using namespace SCIRun::Core::Geometry;
42+
using namespace SCIRun::Core::Algorithms;
4143
using namespace SCIRun::Core::Algorithms::Fields;
4244
using namespace SCIRun::TestUtils;
4345

@@ -96,20 +98,20 @@ using namespace SCIRun::TestUtils;
9698

9799
TEST(CleaverInterfaceTest, SphereSignedDistanceFieldMatrix1)
98100
{
99-
InterfaceWithCleaverAlgorithm algo;
101+
InterfaceWithCleaver2Algorithm algo;
100102

101103
std::vector<FieldHandle> inputs;
102104
inputs.push_back(BoxSignedDistanceField(true));
103105
inputs.push_back(BoxSignedDistanceField(false));
104106

105-
auto info = algo.run(inputs);
107+
auto output = boost::dynamic_pointer_cast<Field>(algo.runImpl(inputs)[Variables::OutputField]);
106108

107-
std::cout << "Number of mesh elements: " << info->vmesh()->num_elems() << std::endl;
108-
std::cout << "Number of mesh nodes: " << info->vmesh()->num_nodes() << std::endl;
109-
std::cout << "Number of mesh values: " << info->vfield()->num_values() << std::endl;
109+
std::cout << "Number of mesh elements: " << output->vmesh()->num_elems() << std::endl;
110+
std::cout << "Number of mesh nodes: " << output->vmesh()->num_nodes() << std::endl;
111+
std::cout << "Number of mesh values: " << output->vfield()->num_values() << std::endl;
110112

111-
ASSERT_TRUE(info->vmesh()->num_elems() == 4326);
112-
ASSERT_TRUE(info->vmesh()->num_nodes() == 908);
113-
ASSERT_TRUE(info->vfield()->num_values() == 4326);
113+
ASSERT_TRUE(output->vmesh()->num_elems() == 4326);
114+
ASSERT_TRUE(output->vmesh()->num_nodes() == 908);
115+
ASSERT_TRUE(output->vfield()->num_values() == 4326);
114116

115117
}

‎src/Dataflow/Serialization/Network/Importer/NetworkIO.cc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ const std::map<std::string, std::string> LegacyNetworkIO::moduleRenameMap_ =
214214
{ "CalculateFieldData3", "CalculateFieldData" },
215215
{ "CalculateFieldData4", "CalculateFieldData" },
216216
{ "CalculateFieldData5", "CalculateFieldData" },
217+
{ "InterfaceWithCleaver", "InterfaceWithCleaver2" },
217218
{ "InterfaceWithNeuroFEMForward", "PlaceholderModule" },
218219
{ "ViewLeadSignals", "PlaceholderModule" },
219220
{ "ShowMatrix", "PlaceholderModule" },

0 commit comments

Comments
 (0)