Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
IFOS3D
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package 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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
KIT
GPI
AG
Software
IFOS3D
Compare revisions
139a8e490c34e37d3126874918140dc116a5cdab to 1f3e94f6580a0636d418096057ecbcf8591b58a4
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
kit/gpi/ag/software/ifos3d
Select target project
No results found
1f3e94f6580a0636d418096057ecbcf8591b58a4
Select Git revision
Branches
develop
develop_PortingFromCToCpp_MultidimensionalSubscriptOperator
develop_porting_from_c_to_cpp
el_TTI
feature/rheinstetten
master
optstepl
struct
threading
vector
10 results
Swap
Target
kit/gpi/ag/software/ifos3d
Select target project
kit/gpi/ag/software/ifos3d
1 result
139a8e490c34e37d3126874918140dc116a5cdab
Select Git revision
Branches
develop
develop_PortingFromCToCpp_MultidimensionalSubscriptOperator
develop_porting_from_c_to_cpp
el_TTI
feature/rheinstetten
master
optstepl
struct
threading
vector
10 results
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
Corrected CXX environment variable
· 140e6121
Holger Obermaier
authored
3 weeks ago
140e6121
Avoid unneccessary type cast
· 1f3e94f6
Holger Obermaier
authored
3 weeks ago
1f3e94f6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
build/Makefile
+2
-2
2 additions, 2 deletions
build/Makefile
src/json_parser.cpp
+2
-2
2 additions, 2 deletions
src/json_parser.cpp
with
4 additions
and
4 deletions
build/Makefile
View file @
1f3e94f6
...
@@ -59,7 +59,7 @@ REF := ifos3D_reference.pdf
...
@@ -59,7 +59,7 @@ REF := ifos3D_reference.pdf
###############################################################################
###############################################################################
### GNU compiler with OpenMPI
### GNU compiler with OpenMPI
CC
:=
export
OMPI_CC
=
gcc-13
;
mpicc
CC
:=
export
OMPI_CC
=
gcc-13
;
mpicc
CXX
:=
xport
OMPI_CXX
=
gcc-13
;
mpicxx
CXX
:=
e
xport
OMPI_CXX
=
gcc-13
;
mpicxx
CPPFLAGS
=
-D_GNU_SOURCE
-DLOG_COLOR
-DKISSFFT_DATATYPE
=
float
CPPFLAGS
=
-D_GNU_SOURCE
-DLOG_COLOR
-DKISSFFT_DATATYPE
=
float
EXTRA_CPPFLAGS
:=
-DUSE_MPI
EXTRA_CPPFLAGS
:=
-DUSE_MPI
CFLAGS
=
-O3
-Wall
-Wextra
-g
-std
=
c99
-fopenmp-simd
-flto
-march
=
znver4
CFLAGS
=
-O3
-Wall
-Wextra
-g
-std
=
c99
-fopenmp-simd
-flto
-march
=
znver4
...
@@ -111,7 +111,7 @@ EXTRA_LDFLAGS :=
...
@@ -111,7 +111,7 @@ EXTRA_LDFLAGS :=
## module purge
## module purge
## module add mpi/openmpi/4.1
## module add mpi/openmpi/4.1
## unset CFLAGS CXXFLAGS FCFLAGS FFLAGS OMPI_CFLAGS OMPI_CXXFLAGS OMPI_FCFLAGS OMPI_FFLAGS
## unset CFLAGS CXXFLAGS FCFLAGS FFLAGS OMPI_CFLAGS OMPI_CXXFLAGS OMPI_FCFLAGS OMPI_FFLAGS
## make -j ifos3D HH_MODEL=hh_toy_true.c V=1 \
## make -j ifos3D HH_MODEL=hh_toy_true.c
pp
V=1 \
## OMPI_CC="${HOME}/aocc-compiler-5.0.0/bin/clang" \
## OMPI_CC="${HOME}/aocc-compiler-5.0.0/bin/clang" \
## I_MPI_CC="${HOME}aocc-compiler-5.0.0/bin/clang" \
## I_MPI_CC="${HOME}aocc-compiler-5.0.0/bin/clang" \
## AR="${HOME}/aocc-compiler-5.0.0/bin/llvm-ar" \
## AR="${HOME}/aocc-compiler-5.0.0/bin/llvm-ar" \
...
...
This diff is collapsed.
Click to expand it.
src/json_parser.cpp
View file @
1f3e94f6
...
@@ -55,8 +55,8 @@ int read_objects_from_intputfile(const char *input_file, char **varname_list, ch
...
@@ -55,8 +55,8 @@ int read_objects_from_intputfile(const char *input_file, char **varname_list, ch
if
(((
strstr
(
cline
,
":"
))
&&
((
strstr
(
cline
,
"
\"
"
))))
&&
if
(((
strstr
(
cline
,
":"
))
&&
((
strstr
(
cline
,
"
\"
"
))))
&&
(
!
(
strstr
(
cline
,
"comment"
))
&&
!
(
strstr
(
cline
,
"Comment"
))))
{
(
!
(
strstr
(
cline
,
"comment"
))
&&
!
(
strstr
(
cline
,
"Comment"
))))
{
//count number of double quotes and colon signs
//count number of double quotes and colon signs
occurence_doublequotes
=
count_occure_charinstring
(
cline
,
(
const
char
*
)
"
\"
"
);
occurence_doublequotes
=
count_occure_charinstring
(
cline
,
"
\"
"
);
occurence_commas
=
count_occure_charinstring
(
cline
,
(
const
char
*
)
","
);
occurence_commas
=
count_occure_charinstring
(
cline
,
","
);
//only two pais of double quotes are allowed per line
//only two pais of double quotes are allowed per line
switch
(
occurence_doublequotes
)
{
switch
(
occurence_doublequotes
)
{
...
...
This diff is collapsed.
Click to expand it.