Skip to content

Release 23.3.2+ features hidden #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Jan 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions flow360/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
This module is flow360.
"""

import os

from numpy import pi

from . import global_exception_handler, units
Expand All @@ -14,7 +16,6 @@
from .component.flow360_params import solvers
from .component.flow360_params.boundaries import (
FreestreamBoundary,
HeatFluxWall,
IsothermalWall,
MassInflow,
MassOutflow,
Expand All @@ -26,7 +27,6 @@
SubsonicInflow,
SubsonicOutflowMach,
SubsonicOutflowPressure,
SupersonicInflow,
WallFunction,
)
from .component.flow360_params.flow360_output import Slice, Slices
Expand Down Expand Up @@ -82,7 +82,6 @@
TimeStepping,
UnsteadyTimeStepping,
)
from .component.flow360_params.turbulence_quantities import TurbulenceQuantities
from .component.flow360_params.unit_system import (
CGS_unit_system,
SI_unit_system,
Expand All @@ -102,5 +101,10 @@
from .component.volume_mesh import VolumeMesh
from .component.volume_mesh import VolumeMeshList as MyVolumeMeshes
from .environment import Env
from .flags import Flags
from .user_config import UserConfig
from .version import __version__

if Flags.beta_features():
from .component.flow360_params.boundaries import HeatFluxWall, SupersonicInflow
from .component.flow360_params.turbulence_quantities import TurbulenceQuantities
21 changes: 8 additions & 13 deletions flow360/cli/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,14 @@ def flow360():
@click.option(
"--suppress-submit-warning",
type=bool,
is_flag=True,
help='Whether to suppress warnings for "submit()" when creating new Case, new VolumeMesh etc.',
)
@click.option(
"--show-submit-warning",
"--beta-features",
type=bool,
is_flag=True,
help='Whether to show warnings for "submit()" when creating new Case, new VolumeMesh etc.',
help="Toggle beta features support",
)
def configure(apikey, profile, dev, suppress_submit_warning, show_submit_warning):
def configure(apikey, profile, dev, suppress_submit_warning, beta_features):
"""
Configure flow360.
"""
Expand All @@ -65,17 +63,14 @@ def configure(apikey, profile, dev, suppress_submit_warning, show_submit_warning
dict_utils.merge_overwrite(config, entry)
changed = True

if suppress_submit_warning and show_submit_warning:
raise click.ClickException(
"You cannot use both --suppress-submit-warning AND --show-submit-warning"
if suppress_submit_warning is not None:
dict_utils.merge_overwrite(
config, {"user": {"config": {"suppress_submit_warning": suppress_submit_warning}}}
)

if suppress_submit_warning:
config.update({"user": {"config": {"suppress_submit_warning": True}}})
changed = True

if show_submit_warning:
config.update({"user": {"config": {"suppress_submit_warning": False}}})
if beta_features is not None:
dict_utils.merge_overwrite(config, {"user": {"config": {"beta_features": beta_features}}})
changed = True

with open(config_file, "w", encoding="utf-8") as file_handler:
Expand Down
Loading