***
Wartungsfenster jeden ersten Mittwoch vormittag im Monat
***
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
ngmultiscale
Manage
Activity
Members
Labels
Plan
Issues
1
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hanser, Valentin
ngmultiscale
Commits
bfe5af37
Commit
bfe5af37
authored
2 years ago
by
Hanser, Valentin
Browse files
Options
Downloads
Patches
Plain Diff
minor changes
parent
de3a0828
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
C++/cmake/CMakeCache.txt
+0
-38
0 additions, 38 deletions
C++/cmake/CMakeCache.txt
C++/cmake/CMakeFiles/cmake.check_cache
+0
-1
0 additions, 1 deletion
C++/cmake/CMakeFiles/cmake.check_cache
C++/preisach/ngPreisachVector.cc
+1
-1
1 addition, 1 deletion
C++/preisach/ngPreisachVector.cc
with
1 addition
and
40 deletions
C++/cmake/CMakeCache.txt
deleted
100644 → 0
+
0
−
38
View file @
de3a0828
# This is the CMakeCache file.
# For build in directory: /home/vhanser/Documents/ngmultiscale/C++/cmake
# It was generated by CMake: /usr/bin/cmake
# You can edit this file to change values found and used by cmake.
# If you do not want to change any of the values, simply exit the editor.
# If you do want to change a value, simply edit, save, and exit the editor.
# The syntax for the file is as follows:
# KEY:TYPE=VALUE
# KEY is the name of a variable in the cache.
# TYPE is a hint to GUIs for the type of VALUE, DO NOT EDIT TYPE!.
# VALUE is the current value for the KEY.
########################
# EXTERNAL cache entries
########################
########################
# INTERNAL cache entries
########################
//This is the directory where this CMakeCache.txt was created
CMAKE_CACHEFILE_DIR:INTERNAL=/home/vhanser/Documents/ngmultiscale/C++/cmake
//Major version of cmake used to create the current loaded cache
CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3
//Minor version of cmake used to create the current loaded cache
CMAKE_CACHE_MINOR_VERSION:INTERNAL=22
//Patch version of cmake used to create the current loaded cache
CMAKE_CACHE_PATCH_VERSION:INTERNAL=1
//Path to CMake executable.
CMAKE_COMMAND:INTERNAL=/usr/bin/cmake
//Path to cpack program executable.
CMAKE_CPACK_COMMAND:INTERNAL=/usr/bin/cpack
//Path to ctest program executable.
CMAKE_CTEST_COMMAND:INTERNAL=/usr/bin/ctest
//Path to CMake installation.
CMAKE_ROOT:INTERNAL=/usr/share/cmake-3.22
This diff is collapsed.
Click to expand it.
C++/cmake/CMakeFiles/cmake.check_cache
deleted
100644 → 0
+
0
−
1
View file @
de3a0828
# This file is generated by cmake for dependency checking of the CMakeCache.txt file
This diff is collapsed.
Click to expand it.
C++/preisach/ngPreisachVector.cc
+
1
−
1
View file @
bfe5af37
...
@@ -42,7 +42,7 @@ ngPreisachVector<DIM>::ngPreisachVector(shared_ptr<MeshAccess>& mesh, Integratio
...
@@ -42,7 +42,7 @@ ngPreisachVector<DIM>::ngPreisachVector(shared_ptr<MeshAccess>& mesh, Integratio
mips
[
el
][
ip
]
=
{
intrule
[
ip
],
mesh
->
GetTrafo
(
el
,
global_alloc
)
};
mips
[
el
][
ip
]
=
{
intrule
[
ip
],
mesh
->
GetTrafo
(
el
,
global_alloc
)
};
//cout <<"(" << mips[el][ip].GetPoint()[0] << ", " << mips[el][ip].GetPoint()[1] << ", " << mips[el][ip].GetPoint()[2] << ")" << endl;
//cout <<"(" << mips[el][ip].GetPoint()[0] << ", " << mips[el][ip].GetPoint()[1] << ", " << mips[el][ip].GetPoint()[2] << ")" << endl;
//cout << ptrMask->Evaluate(mips[el][ip]) << endl;
//
cout << ptrMask->Evaluate(mips[el][ip]) << endl;
if
(
ptrMask
==
nullptr
||
ptrMask
->
Evaluate
(
mips
[
el
][
ip
])){
if
(
ptrMask
==
nullptr
||
ptrMask
->
Evaluate
(
mips
[
el
][
ip
])){
//preisachVectorPoints[el][ip] = std::make_shared<preisachVector>(pE, ptrDist);
//preisachVectorPoints[el][ip] = std::make_shared<preisachVector>(pE, ptrDist);
preisachVectorPoints
[
el
][
ip
]
=
std
::
make_shared
<
preisachVector
<
DIM
>>
(
ptrPreisachP
);
// is faster to copy results of a single
preisachVectorPoints
[
el
][
ip
]
=
std
::
make_shared
<
preisachVector
<
DIM
>>
(
ptrPreisachP
);
// is faster to copy results of a single
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment