Skip to content

Commit

Permalink
Merge pull request #14 from ddiakiteaneo/dd/new_merge
Browse files Browse the repository at this point in the history 
Merge with code saturne
  • Loading branch information
@ddiakiteaneo
ddiakiteaneo committed Jan 12, 2024
2 parents e8d9937 + 5246828 commit b0b8e08
Show file tree
Hide file tree
Showing 1,899 changed files with 34,612 additions and 27,946 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

# This file is part of code_saturne, a general-purpose CFD tool.
#
# Copyright (C) 1998-2023 EDF S.A.
# Copyright (C) 1998-2024 EDF S.A.
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
This file is part of code_saturne, a general-purpose CFD tool.
Copyright (C) 1998-2023 EDF S.A.
Copyright (C) 1998-2024 EDF S.A.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# This file is part of code_saturne, a general-purpose CFD tool.
#
# Copyright (C) 1998-2023 EDF S.A.
# Copyright (C) 1998-2024 EDF S.A.
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
Expand Down
56 changes: 56 additions & 0 deletions NEWS.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,47 @@
Master (not on release branches yet)
------------------------------------

### Numerics:

- Reshape the interface with the MUMPS library (sparse direct solver)
to make the usage of common MUMPS options easier. Take benefit from
optimizations available in the latest 5.6.2 version.

### User changes:

- Combustion models: change activation mode.
* In user-defined functions, gas and coal combustion models should now be
activated using `cs_combustion_gas_set_model` and
`cs_coal_model_set_model` respectively, and cannot be activated
directly by setting values in `cs_glob_physical_model_flag`
(or `ippmod` in Fortran), as the activation functions must be called
to allocate the required structures.
* The name of the thermochemical data file and JANAF indicator can
now be set from C, and not from Fortran anymore.
* Separate structures (`cs_glob_combustion_gas_model` and
(`cs_glob_coal_model`) are used for each combustion type, with
no shared member or substructure (compared to the previous
`cs_glob_combustion_model` structure).
* Some module variables have been moved to different modules, to better
align with the models actually using them.

- Combustion models: remove diftl0 keyword. The corresponding value
should be handled directly using the "diffusivity_ref" keyword
for the Enthalpy field.

- Compressible flows: remove uscfx1 and uscfx2 user-defined functions.
Standard functions such as cs_user_parameters can be used instead.

### Studymanager:

- Both options --slurm-batch-wtime=H and --slurm-batch-size=N allow to submit
batches of cases using the SLURM resource manager on cluster. New keywork
expected_time (HH:MM) can be used in smgr xml file to define expected
computation time.

Release 8.1.0 (2023-12-13)
--------------------------

### Physical modeling

- Remove obsolete and experimental heavy fuel combustion model
Expand All @@ -20,6 +61,11 @@ Master (not on release branches yet)

### User changes:

- GUI: add access to various "per variable" equation parameters.
* Handling of convection schemes is revamped, allowing selection
of "true SOLU" (with upwind gradient), blended, and TVD/NVD schemes.
* Most individual gradient options are now available in a new tab.

- Add high-level objects to handle open (inlet/outlet) boundary conditions
in the general boundary conditions mechanism.
* This is an evolution the the handling of BC's with the GUI, now
Expand Down Expand Up @@ -48,6 +94,12 @@ Master (not on release branches yet)
on interior faces or interior face centers.
* The "per cell" and "per vertex" maxima are removed.

- Modifications in the way to set MUMPS solvers using cs_sles_param_t
structure. Advanced settings can now be set thanks to the two functions
cs_param_sles_mumps() and cs_param_sles_mumps_advanced(). More advanced
settings can still be specified using the user-defined function
cs_user_sles_mumps_hook

### Numerics:

- Use local fixed-point algorithm for vector and tensor least-squares
Expand Down Expand Up @@ -77,6 +129,10 @@ Master (not on release branches yet)

- Preprocessor: fix reading of polygons in MED files, broken in v7.3.

- Fix numerical settings for Navier-Stokes problems with CDO schemes. User
modifications may not be taken into account and one remains to the default
settings (e.g. Hodge parameters for the viscous term)

Release 8.0.0 (2023-06-30)
--------------------------

Expand Down
2 changes: 1 addition & 1 deletion bin/code_saturne.py.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# This file is part of code_saturne, a general-purpose CFD tool.
#
# Copyright (C) 1998-2023 EDF S.A.
# Copyright (C) 1998-2024 EDF S.A.
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
Expand Down
2 changes: 1 addition & 1 deletion bin/code_saturne.sh.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# This file is part of code_saturne, a general-purpose CFD tool.
#
# Copyright (C) 1998-2023 EDF S.A.
# Copyright (C) 1998-2024 EDF S.A.
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
Expand Down
29 changes: 14 additions & 15 deletions bin/runcase_mpi_rank
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# This file is part of code_saturne, a general-purpose CFD tool.
#
# Copyright (C) 1998-2023 EDF S.A.
# Copyright (C) 1998-2024 EDF S.A.
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
Expand Down Expand Up @@ -38,14 +38,16 @@
# Current systems
# ---------------

# For MPICH (which also provides the mpiexec command)
if [ "$PMI_RANK" != "" ] ; then
# For PMIx (shared by most MPI libraries)
if [ "$PMIX_RANK" != "" ] ; then
MPI_RANK="$PMIX_RANK"

# For MPICH
elif [ "$PMI_RANK" != "" ] ; then
MPI_RANK="$PMI_RANK"

# For Open MPI (it also provides the mpiexec command)
elif [ "$OMPI_MCA_ns_nds_vpid" != "" ] ; then # Open MPI 1.2
MPI_RANK="$OMPI_MCA_ns_nds_vpid"
elif [ "$OMPI_COMM_WORLD_RANK" != "" ] ; then # Open MPI 1.3
# For Open MPI (prefer PMIx, available in current Open MPI versions)
elif [ "$OMPI_COMM_WORLD_RANK" != "" ] ; then # Since Open MPI 1.3
MPI_RANK="$OMPI_COMM_WORLD_RANK"

# Otherwise, with SLURM
Expand All @@ -54,14 +56,10 @@ elif [ "$PMI_ID" != "" ] ; then
elif [ "$SLURM_PROCID" != "" ] ; then
MPI_RANK="$SLURM_PROCID"

# For IBM Platform MPI
elif [ "$MPI_RANKID" != "" ] ; then
MPI_RANK="$MPI_RANKID"

# Current systems for which we have no access (so trust docs)
# -------------------------------------------

# For IBM PE
# For IBM PE / IBM Spectrum MPI
elif [ "$MP_CHILD" != "" ] ; then
MPI_RANK="$MP_CHILD"

Expand All @@ -72,9 +70,10 @@ elif [ "$MP_CHILD" != "" ] ; then
elif [ "$SMPIRUN_RANK" != "" ] ; then
MPI_RANK="$MPIRUN_RANK"

# On cluster with HP-MPI (has become Platform MPI since)
elif [ "$MPI_PROC" != "" ] ; then
MPI_RANK=`echo $MPI_PROC | cut -f 2 -d,`
# For IBM Platform MPI (formerly HP-MPI),
# discontinued 04/2020 in switch to Open MPI.
elif [ "$MPI_RANKID" != "" ] ; then
MPI_RANK="$MPI_RANKID"

# End of known cases
fi
Expand Down
2 changes: 1 addition & 1 deletion config/code_saturne_build.cfg.in.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# This file is part of code_saturne, a general-purpose CFD tool.
#
# Copyright (C) 1998-2023 EDF S.A.
# Copyright (C) 1998-2024 EDF S.A.
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
Expand Down
15 changes: 8 additions & 7 deletions config/cs_auto_flags.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# This file is part of code_saturne, a general-purpose CFD tool.
#
# Copyright (C) 1998-2023 EDF S.A.
# Copyright (C) 1998-2024 EDF S.A.
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
Expand Down Expand Up @@ -234,7 +234,7 @@ if test "x$cs_gcc" = "xgcc"; then
test -n "$cs_cc_vers_patch" || cs_cc_vers_patch=0

# Default compiler flags
cflags_default="-funsigned-char -W -Wall -Werror=shadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wunused -Wfloat-equal -Werror=implicit-function-declaration"
cflags_default="-funsigned-char -W -Wall -Werror=shadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Werror=missing-prototypes -Wmissing-declarations -Wnested-externs -Wunused -Wfloat-equal -Werror=implicit-function-declaration"
cflags_default_dbg="-g"
cflags_default_opt="-O2"
cflags_default_hot="-O3"
Expand Down Expand Up @@ -660,9 +660,10 @@ if test "x$cs_gxx" = "xg++"; then

case "$cs_cxx_vendor-$cs_cxx_version" in
g++-4.[012345678]*)
cxxflags_default="$cxxflags_default -std=c++1y"
;;
*)
cxxflags_default="$cxxflags_default -std=c++11"
cxxflags_default="$cxxflags_default -std=c++14"
;;
esac

Expand Down Expand Up @@ -712,7 +713,7 @@ elif test "x$cs_gxx" = "xicpc"; then
test -n "$cs_cxx_vers_patch" || cs_cxx_vers_patch=0

# Default compiler flags
cxxflags_default="-std=c++11 -Wall -Wcheck -Wshadow -Wpointer-arith -Wmissing-prototypes -Wuninitialized -Wunused"
cxxflags_default="-std=c++14 -Wall -Wcheck -Wshadow -Wpointer-arith -Wmissing-prototypes -Wuninitialized -Wunused"
cxxflags_default_dbg="-g -O0 -traceback -w2 -Wp64 -ftrapuv"
cxxflags_default_opt="-O2"
cxxflags_default_hot="-O3"
Expand Down Expand Up @@ -849,7 +850,7 @@ if test "x$cs_cxx_compiler_known" != "xyes" ; then
cs_cxx_compiler_known=yes

# Default compiler flags
cxxflags_default="-h std=c++11"
cxxflags_default="-h std=c++14"
cxxflags_default_opt="-O2"
cxxflags_default_hot="-O3"
cxxflags_default_dbg="-g"
Expand All @@ -875,7 +876,7 @@ if test "x$cs_cxx_compiler_known" != "xyes" ; then
cs_cxx_compiler_known=yes

# Default compiler flags
cxxflags_default="-x c++11 -fPIC"
cxxflags_default="-x c++14 -fPIC"
cxxflags_default_opt="-O2"
cxxflags_default_hot="-O3" # Bug observed when -O3 is used
cxxflags_default_dbg="-g"
Expand All @@ -899,7 +900,7 @@ if test "x$cs_cxx_compiler_known" != "xyes" ; then
cs_cxx_compiler_known=yes

# Default compiler flags
cxxflags_default="-std=c++11 -fPIC"
cxxflags_default="-std=c++14 -fPIC"
cxxflags_default_opt="-O2"
cxxflags_default_hot="-O3"
cxxflags_default_dbg="-g"
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# This file is part of code_saturne, a general-purpose CFD tool.
#
# Copyright (C) 1998-2023 EDF S.A.
# Copyright (C) 1998-2024 EDF S.A.
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
Expand All @@ -30,7 +30,7 @@ m4_define([cs_licence_c_comment],
[/*
This file is part of code_saturne, a general-purpose CFD tool.
Copyright (C) 1998-2023 EDF S.A.
Copyright (C) 1998-2024 EDF S.A.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Expand Down
2 changes: 1 addition & 1 deletion data/user/cs_user_scripts.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# This file is part of code_saturne, a general-purpose CFD tool.
#
# Copyright (C) 1998-2023 EDF S.A.
# Copyright (C) 1998-2024 EDF S.A.
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
Expand Down
2 changes: 1 addition & 1 deletion docs/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# This file is part of code_saturne, a general-purpose CFD tool.
#
# Copyright (C) 1998-2023 EDF S.A.
# Copyright (C) 1998-2024 EDF S.A.
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
Expand Down
2 changes: 1 addition & 1 deletion docs/doxygen/Doxyfile-src
View file
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ IDL_PROPERTY_SUPPORT = YES
# all members of a group must be documented explicitly.
# The default value is: NO.

DISTRIBUTE_GROUP_DOC = NO
DISTRIBUTE_GROUP_DOC = YES

# If one adds a struct or class to a group and this option is enabled, then also
# any nested class or struct is added to the same group. By default this option
Expand Down
2 changes: 1 addition & 1 deletion docs/doxygen/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# This file is part of code_saturne, a general-purpose CFD tool.
#
# Copyright (C) 1998-2023 EDF S.A.
# Copyright (C) 1998-2024 EDF S.A.
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
Expand Down
2 changes: 1 addition & 1 deletion docs/doxygen/developer_guide/build_system.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
This file is part of code_saturne, a general-purpose CFD tool.
Copyright (C) 1998-2023 EDF S.A.
Copyright (C) 1998-2024 EDF S.A.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Expand Down
2 changes: 1 addition & 1 deletion docs/doxygen/developer_guide/coding_style.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
This file is part of code_saturne, a general-purpose CFD tool.
Copyright (C) 1998-2023 EDF S.A.
Copyright (C) 1998-2024 EDF S.A.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Expand Down
2 changes: 1 addition & 1 deletion docs/doxygen/developer_guide/common_constructs.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
This file is part of code_saturne, a general-purpose CFD tool.
Copyright (C) 1998-2023 EDF S.A.
Copyright (C) 1998-2024 EDF S.A.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Expand Down
2 changes: 1 addition & 1 deletion docs/doxygen/developer_guide/debugging.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
This file is part of code_saturne, a general-purpose CFD tool.
Copyright (C) 1998-2023 EDF S.A.
Copyright (C) 1998-2024 EDF S.A.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Expand Down
2 changes: 1 addition & 1 deletion docs/doxygen/developer_guide/developer_guide.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
This file is part of code_saturne, a general-purpose CFD tool.
Copyright (C) 1998-2023 EDF S.A.
Copyright (C) 1998-2024 EDF S.A.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Expand Down
2 changes: 1 addition & 1 deletion docs/doxygen/developer_guide/further_reading.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
!--
This file is part of code_saturne, a general-purpose CFD tool.

Copyright (C) 1998-2023 EDF S.A.
Copyright (C) 1998-2024 EDF S.A.

This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Expand Down
2 changes: 1 addition & 1 deletion docs/doxygen/developer_guide/node_level_parallelism.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
This file is part of code_saturne, a general-purpose CFD tool.
Copyright (C) 1998-2023 EDF S.A.
Copyright (C) 1998-2024 EDF S.A.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Expand Down
2 changes: 1 addition & 1 deletion docs/doxygen/developer_guide/profiling.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
This file is part of code_saturne, a general-purpose CFD tool.
Copyright (C) 1998-2023 EDF S.A.
Copyright (C) 1998-2024 EDF S.A.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Expand Down
Loading

0 comments on commit b0b8e08

Please sign in to comment.