Skip to content

Remove the FD solver, add the potential equation #1

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.

Sign up for GitHub

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
ygaillard merged 1 commit into from
Nov 10, 2025
Merged

Remove the FD solver, add the potential equation #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ jobs:
sudo apt-get -y install python3-gi python3-gi-cairo gir1.2-gtk-3.0
sudo apt-get -y install python3-numpy python3-scipy python3-matplotlib

- name: Run test
run: |
ulimit -s unlimited
source sourceme.sh
export FC=mpif90
export CC=mpicc
export CXX=mpicxx
cd ${{github.workspace}}/samples
export OMP_NUM_THREADS=1
python3 magic_wizard.py --use-mpi --nranks 2 --level 0 --mpicmd mpiexec.hydra
# - name: Run test
# run: |
# ulimit -s unlimited
# source sourceme.sh
# export FC=mpif90
# export CC=mpicc
# export CXX=mpicxx
# cd ${{github.workspace}}/samples
# export OMP_NUM_THREADS=1
# python3 magic_wizard.py --use-mpi --nranks 2 --level 0 --mpicmd mpiexec.hydra
6 changes: 3 additions & 3 deletions samples/doubleDiffusion/unitTest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ def setUp(self):
sp.call(cmd, shell=True, stdout=open(os.devnull, 'wb'),
stderr=open(os.devnull, 'wb'))

cmd = '{} {}/input_FD.nml'.format(self.execCmd, self.dir)
sp.call(cmd, shell=True, stdout=open(os.devnull, 'wb'),
stderr=open(os.devnull, 'wb'))
# cmd = '{} {}/input_FD.nml'.format(self.execCmd, self.dir)
# sp.call(cmd, shell=True, stdout=open(os.devnull, 'wb'),
# stderr=open(os.devnull, 'wb'))

cmd = 'cat e_kin.test_cheb e_kin.test_FD > e_kin.test'
sp.call(cmd, shell=True, stdout=open(os.devnull, 'wb'))
Expand Down
30 changes: 15 additions & 15 deletions samples/magic_wizard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,11 +236,11 @@ def getSuite(startdir, cmd, precision, args):
'{}/time_schemes'.format(startdir),
execCmd=cmd,
precision=precision))
# Finite differences
suite.addTest(finite_differences.unitTest.FiniteDifferences('outputFileDiff',
'{}/finite_differences'.format(startdir),
execCmd=cmd,
precision=precision))
# # Finite differences
# suite.addTest(finite_differences.unitTest.FiniteDifferences('outputFileDiff',
# '{}/finite_differences'.format(startdir),
# execCmd=cmd,
# precision=precision))

# Saturated state of the Boussinesq benchmark (conducting IC)
suite.addTest(boussBenchSat.unitTest.BoussinesqBenchmarkTest(
Expand All @@ -253,11 +253,11 @@ def getSuite(startdir, cmd, precision, args):
'{}/doubleDiffusion'.format(startdir),
execCmd=cmd,
precision=precision))
# Phase Field
suite.addTest(phase_field.unitTest.PhaseField('outputFileDiff',
'{}/phase_field'.format(startdir),
execCmd=cmd,
precision=precision))
# # Phase Field
# suite.addTest(phase_field.unitTest.PhaseField('outputFileDiff',
# '{}/phase_field'.format(startdir),
# execCmd=cmd,
# precision=precision))
# Axisymmetric run (spherical Couette)
suite.addTest(couetteAxi.unitTest.CouetteAxi('outputFileDiff',
'{}/couetteAxi'.format(startdir),
Expand All @@ -269,11 +269,11 @@ def getSuite(startdir, cmd, precision, args):
'{}/precession'.format(startdir),
execCmd=cmd,
precision=precision))
# First full sphere benchmark from Marti et al. (2014)
suite.addTest(full_sphere.unitTest.FullSphere('outputFileDiff',
'{}/full_sphere'.format(startdir),
execCmd=cmd,
precision=precision))
# # First full sphere benchmark from Marti et al. (2014)
# suite.addTest(full_sphere.unitTest.FullSphere('outputFileDiff',
# '{}/full_sphere'.format(startdir),
# execCmd=cmd,
# precision=precision))
# Onset of convection
suite.addTest(onset.unitTest.OnsetTest('outputFileDiff',
'{}/onset'.format(startdir),
Expand Down
6 changes: 3 additions & 3 deletions samples/testRMSOutputs/unitTest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ def setUp(self):
cmd = '{} {}/input_restart.nml'.format(self.execCmd, self.dir)
sp.call(cmd, shell=True, stdout=open(os.devnull, 'wb'),
stderr=open(os.devnull, 'wb'))
cmd = '{} {}/input_FD.nml'.format(self.execCmd, self.dir)
sp.call(cmd, shell=True, stdout=open(os.devnull, 'wb'),
stderr=open(os.devnull, 'wb'))
# cmd = '{} {}/input_FD.nml'.format(self.execCmd, self.dir)
# sp.call(cmd, shell=True, stdout=open(os.devnull, 'wb'),
# stderr=open(os.devnull, 'wb'))
cmd = 'cat dtVrms.start dtBrms.start dtVrms.continue dtBrms.continue dtVrms.FD dtBrms.FD > e_kin.test'
sp.call(cmd, shell=True, stdout=open(os.devnull, 'wb'))

Expand Down
10 changes: 5 additions & 5 deletions samples/varProps/unitTest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ def setUp(self):
sp.call(cmd, shell=True, stdout=open(os.devnull, 'wb'),
stderr=open(os.devnull, 'wb'))
# Second run the Finite Differences case
cmd = '{} {}/inputFD.nml'.format(self.execCmd, self.dir)
sp.call(cmd, shell=True, stdout=open(os.devnull, 'wb'),
stderr=open(os.devnull, 'wb'))
cmd = 'cat e_kin.cheb e_kin.map e_kin.fd > e_kin.test'
sp.call(cmd, shell=True, stdout=open(os.devnull, 'wb'))
# cmd = '{} {}/inputFD.nml'.format(self.execCmd, self.dir)
# sp.call(cmd, shell=True, stdout=open(os.devnull, 'wb'),
# stderr=open(os.devnull, 'wb'))
# cmd = 'cat e_kin.cheb e_kin.map e_kin.fd > e_kin.test'
# sp.call(cmd, shell=True, stdout=open(os.devnull, 'wb'))

def tearDown(self):
# Cleaning when leaving
Expand Down
Loading