Skip to content

Commit

Permalink
update seamount test
Browse files Browse the repository at this point in the history
  • Loading branch information
hklion committed Dec 13, 2023
1 parent 55a9aae commit 6d2ce0d
Show file tree
Hide file tree
Showing 9 changed files with 49 additions and 92 deletions.
15 changes: 7 additions & 8 deletions Exec/Seamount/inputs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ stop_time = 30000.0

amrex.fpe_trap_invalid = 1

#fabarray.mfiter_tile_size = 1024 1024 1024
fabarray.mfiter_tile_size = 16 16 1024
fabarray.mfiter_tile_size = 1024 1024 1024

# PROBLEM SIZE & GEOMETRY
# dims come from ROMS ana_grid, and must match vals in prob.cpp right now
Expand Down Expand Up @@ -53,16 +52,16 @@ romsx.use_coriolis = true
romsx.horizontal_advection_scheme = "upstream3" # upstream3 or centered4
romsx.spatial_order = 2

romsx.coriolis_f0 = -8.26e-5
romsx.coriolis_f0 = 1.0e-4 #-8.26e-5

romsx.theta_s = 3.0
romsx.theta_b = 0
romsx.tcline = 150
romsx.theta_s = 6.5
romsx.theta_b = 2.0
romsx.tcline = 100.

# PROBLEM PARAMETERS (optional)
romsx.R0 = 1027.0 # background density value (Kg/m3) used in Linear Equation of State
romsx.S0 = 35.0 # background salinity (nondimensional) constant
romsx.T0 = 14.0 # background potential temperature (Celsius) constant
romsx.S0 = 32.0 # background salinity (nondimensional) constant
romsx.T0 = 10.0 # background potential temperature (Celsius) constant
romsx.Tcoef = 1.7e-4 # linear equation of state parameter (1/Celcius)
romsx.Scoef = 0.0 # linear equation of state parameter (nondimensional)
romsx.rho0 = 1025.0 # Mean density (Kg/m3) used when Boussinesq approx is inferred
21 changes: 3 additions & 18 deletions Tests/ROMSX_Gold_Files/Seamount/Header
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,9 @@ z_velocity
6530.6122448979595 6666.666666666667 384.61538461538464
0
0
0 6 600
0 1 600
10
0 111020.40816326531
0 160000
-5000 0
0 111020.40816326531
160000 320000
-5000 0
111020.40816326531 215510.20408163266
0 160000
-5000 0
111020.40816326531 215510.20408163266
160000 320000
-5000 0
215510.20408163266 320000
0 160000
-5000 0
215510.20408163266 320000
160000 320000
0 320000
0 320000
-5000 0
Level_0/Cell
Binary file modified Tests/ROMSX_Gold_Files/Seamount/Level_0/Cell_D_00000
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
34 changes: 7 additions & 27 deletions Tests/ROMSX_Gold_Files/Seamount/Level_0/Cell_H
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,15 @@
1
6
0
(6 0
((0,0,0) (16,23,12) (0,0,0))
((0,24,0) (16,47,12) (0,0,0))
((17,0,0) (32,23,12) (0,0,0))
((17,24,0) (32,47,12) (0,0,0))
((33,0,0) (48,23,12) (0,0,0))
((33,24,0) (48,47,12) (0,0,0))
(1 0
((0,0,0) (48,47,12) (0,0,0))
)
6
FabOnDisk: Cell_D_00002 0
1
FabOnDisk: Cell_D_00000 0
FabOnDisk: Cell_D_00003 0
FabOnDisk: Cell_D_00000 254682
FabOnDisk: Cell_D_00001 0
FabOnDisk: Cell_D_00001 239706

6,6
1.0091152195473329e+01,0.0000000000000000e+00,3.1999999999999950e+01,-8.0596562274061335e-06,-4.7571516124719847e-06,0.0000000000000000e+00,
1.0091152195473322e+01,0.0000000000000000e+00,3.1999999999999947e+01,-8.2337553238976310e-06,-7.3240047089317704e-06,0.0000000000000000e+00,
1.0091152209737174e+01,0.0000000000000000e+00,3.1999999999999943e+01,-1.7154954710763102e-04,-1.6816946567474648e-04,0.0000000000000000e+00,
1.0091152209737173e+01,0.0000000000000000e+00,3.1999999999999940e+01,-1.7555807622884347e-04,-1.0041814688398989e-04,0.0000000000000000e+00,
1.0091152195473322e+01,0.0000000000000000e+00,3.1999999999999947e+01,-1.4407271866654339e-05,-3.0824026304662890e-06,0.0000000000000000e+00,
1.0091152195473329e+01,0.0000000000000000e+00,3.1999999999999947e+01,-1.4375289106788807e-05,-6.1547967524413109e-06,0.0000000000000000e+00,
1,6
1.0077862332931520e+01,0.0000000000000000e+00,3.1999999999999950e+01,-1.9486252177584751e-04,-1.8648290131852529e-04,0.0000000000000000e+00,

6,6
1.7436210557246753e+01,0.0000000000000000e+00,3.2000000000000050e+01,1.4375289102152935e-05,7.8067921994399393e-06,0.0000000000000000e+00,
1.7436210557231885e+01,0.0000000000000000e+00,3.2000000000000050e+01,1.4407271871353746e-05,4.4587673291830429e-06,0.0000000000000000e+00,
1.7464062300273408e+01,0.0000000000000000e+00,3.2000000000000057e+01,1.7555807622686217e-04,1.0041814688891416e-04,0.0000000000000000e+00,
1.7464062300273408e+01,0.0000000000000000e+00,3.2000000000000050e+01,1.7154954711114776e-04,1.6816946567141416e-04,0.0000000000000000e+00,
1.7434501861032235e+01,0.0000000000000000e+00,3.2000000000000050e+01,8.2337553251508738e-06,5.6784458386967229e-06,0.0000000000000000e+00,
1.7434501861035898e+01,0.0000000000000000e+00,3.2000000000000050e+01,8.0596562265545909e-06,3.3850743510283830e-06,0.0000000000000000e+00,
1,6
1.7475030574920066e+01,0.0000000000000000e+00,3.2000000000000057e+01,1.9486252177614729e-04,1.8648290131693601e-04,0.0000000000000000e+00,

45 changes: 21 additions & 24 deletions Tests/ROMSX_Gold_Files/Seamount/job_info
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,38 @@
===============================================================================
inputs file: inputs

number of MPI processes: 4
number of MPI processes: 1

CPU time used since start of simulation (CPU-hours): 0.0158847
CPU time used since start of simulation (CPU-hours): 0.00935854

===============================================================================
Plotfile Information
===============================================================================
output data / time: Tue Dec 12 10:35:43 2023
output dir: /home/almgren/GitCode/ROMSX/Exec/Seamount
output data / time: Wed Dec 13 13:48:14 2023
output dir: /home/klion/software/ROMSX/Exec/Seamount


===============================================================================
Build Information
===============================================================================
build date: 2023-12-12 10:31:21.485092
build machine: Linux manda 5.15.0-76-generic #83~20.04.1-Ubuntu SMP Wed Jun 21 20:23:31 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux
build dir: /home/almgren/GitCode/ROMSX/Exec/Seamount
AMReX dir: /home/almgren/GitCode/amrex
build date: 2023-12-13 10:58:24.850589
build machine: Linux varan 5.15.0-79-generic #86~20.04.2-Ubuntu SMP Mon Jul 17 23:27:17 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux
build dir: /home/klion/software/ROMSX/Exec/Seamount
AMReX dir: ../../Submodules/AMReX

COMP: gnu
COMP version: 9.4.0


ROMSX git hash: fe8d901-dirty
AMReX git hash: 23.12-8-g43d71da32-dirty
ROMSX git hash: 80e5cb2-dirty
AMReX git hash: 23.09-22-gb2052f2d2


===============================================================================
Grid Information
===============================================================================
level: 0
number of boxes = 6
number of boxes = 1
maximum zones = 49 48 13

Boundary conditions
Expand Down Expand Up @@ -75,19 +75,16 @@ romsx.plotfile_type = amrex
romsx.use_coriolis = true
romsx.horizontal_advection_scheme = upstream3
romsx.spatial_order = 2
prob.R0 = 1027.0
prob.S0 = 32.0
prob.T0 = 10.0
prob.rho_0 = 1.0
prob.T_0 = 1.0
prob.A_0 = 1.0
prob.u_0 = 0.0
prob.v_0 = 0.0
prob.rad_0 = 0.25
prob.z0 = 0.1
prob.zRef = 80.0e-3
prob.uRef = 8.0e-3
prob.prob_type = 12
romsx.coriolis_f0 = 1.0e-4
romsx.theta_s = 6.5
romsx.theta_b = 2.0
romsx.tcline = 100.
romsx.R0 = 1027.0
romsx.S0 = 32.0
romsx.T0 = 10.0
romsx.Tcoef = 1.7e-4
romsx.Scoef = 0.0
romsx.rho0 = 1025.0
amr.refine_grid_layout_x = 1
amr.refine_grid_layout_y = 1
amr.refine_grid_layout_z = 0
Expand Down
26 changes: 11 additions & 15 deletions Tests/test_files/Seamount/Seamount.i
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,16 @@ romsx.use_coriolis = true
romsx.horizontal_advection_scheme = "upstream3" # upstream3 or centered4
romsx.spatial_order = 2

# PROBLEM PARAMETERS (optional)
prob.R0 = 1027.0
prob.S0 = 32.0
prob.T0 = 10.0
romsx.coriolis_f0 = 1.0e-4 #-8.26e-5

# PROBLEM PARAMETERS (shear)
prob.rho_0 = 1.0
prob.T_0 = 1.0
prob.A_0 = 1.0
prob.u_0 = 0.0
prob.v_0 = 0.0
prob.rad_0 = 0.25
prob.z0 = 0.1
prob.zRef = 80.0e-3
prob.uRef = 8.0e-3
romsx.theta_s = 6.5
romsx.theta_b = 2.0
romsx.tcline = 100.

prob.prob_type = 12
# PROBLEM PARAMETERS (optional)
romsx.R0 = 1027.0 # background density value (Kg/m3) used in Linear Equation of State
romsx.S0 = 32.0 # background salinity (nondimensional) constant
romsx.T0 = 10.0 # background potential temperature (Celsius) constant
romsx.Tcoef = 1.7e-4 # linear equation of state parameter (1/Celcius)
romsx.Scoef = 0.0 # linear equation of state parameter (nondimensional)
romsx.rho0 = 1025.0 # Mean density (Kg/m3) used when Boussinesq approx is inferred

0 comments on commit 6d2ce0d

Please sign in to comment.