Skip to content
Snippets Groups Projects
Commit 0af3c6e5 authored by Matthieu Schaller's avatar Matthieu Schaller Committed by Peter W. Draper
Browse files

Remove the global pressure floor variable

parent def8ca7c
Branches
Tags
2 merge requests!1548Mayor Sync,!1534Remove the global pressure floor variable
......@@ -103,6 +103,7 @@ int main(int argc, char *argv[]) {
struct feedback_props feedback_properties;
struct rt_props rt_properties;
struct entropy_floor_properties entropy_floor;
struct pressure_floor_props pressure_floor_props;
struct black_holes_props black_holes_properties;
struct fof_props fof_properties;
struct lightcone_array_props lightcone_array_properties;
......
......@@ -153,7 +153,7 @@ AM_SOURCES += collectgroup.c hydro_space.c equation_of_state.c io_compression.c
AM_SOURCES += chemistry.c cosmology.c velociraptor_interface.c
AM_SOURCES += output_list.c velociraptor_dummy.c csds_io.c memuse.c mpiuse.c memuse_rnodes.c
AM_SOURCES += fof.c fof_catalogue_io.c
AM_SOURCES += hashmap.c pressure_floor.c
AM_SOURCES += hashmap.c
AM_SOURCES += mesh_gravity.c mesh_gravity_mpi.c mesh_gravity_patch.c mesh_gravity_sort.c
AM_SOURCES += runner_neutrino.c
AM_SOURCES += neutrino/Default/fermi_dirac.c neutrino/Default/neutrino.c neutrino/Default/neutrino_response.c
......
......@@ -37,6 +37,7 @@
#include "fof.h"
#include "mpiuse.h"
#include "part.h"
#include "pressure_floor.h"
#include "proxy.h"
#include "star_formation.h"
#include "star_formation_logger.h"
......@@ -491,6 +492,7 @@ void engine_config(int restart, int fof, struct engine *e,
/* Print information about the hydro scheme */
if (e->policy & engine_policy_hydro) {
if (e->nodeID == 0) hydro_props_print(e->hydro_properties);
if (e->nodeID == 0) pressure_floor_print(e->pressure_floor_props);
if (e->nodeID == 0) entropy_floor_print(e->entropy_floor);
}
......
......@@ -219,9 +219,6 @@ void hydro_props_print(const struct hydro_props *p) {
/* Print equation of state first */
eos_print(&eos);
/* Then the pressure floor */
pressure_floor_print(&pressure_floor_props);
/* Now SPH */
message("Hydrodynamic scheme: %s in %dD.", SPH_IMPLEMENTATION,
(int)hydro_dimension);
......
/*******************************************************************************
* This file is part of SWIFT.
* Copyright (c) 2019 Loic Hausammann (loic.hausammann@epfl.ch)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
******************************************************************************/
/* This object's header. */
#include "pressure_floor.h"
/* Pressure floor for the physics model. */
struct pressure_floor_props pressure_floor_props;
......@@ -32,8 +32,6 @@
#include "error.h"
#include "inline.h"
extern struct pressure_floor_props pressure_floor_props;
/* Check if pressure floor is implemented in hydro */
#ifndef PRESSURE_FLOOR_NONE
#if defined(GADGET2_SPH) || defined(HOPKINS_PU_SPH) || defined(SPHENIX_SPH)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment