Skip to content

Commit

Permalink
Update minor changes to OptionsFactory API
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnomotani
johnomotani committed May 4, 2020
1 parent 5e12fef commit fcab586
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 56 deletions.
34 changes: 17 additions & 17 deletions hypnotoad/cases/tokamak.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class TokamakEquilibrium(Equilibrium):
5,
doc="Number of radial points in the core",
value_type=int,
checks=is_positive,
check_all=is_positive,
),
nx_pf=WithMeta(
"nx_core",
Expand All @@ -53,19 +53,19 @@ class TokamakEquilibrium(Equilibrium):
"varied due to BOUT++ limitations"
),
value_type=int,
checks=is_positive,
check_all=is_positive,
),
nx_inter_sep=WithMeta(
0,
doc="Number of radial points in the inter-separatrix region",
value_type=int,
checks=is_non_negative,
check_all=is_non_negative,
),
nx_sol=WithMeta(
5,
doc="Number of radial points in the SOL",
value_type=int,
checks=is_positive,
check_all=is_positive,
),
nx_sol_inner=WithMeta(
"nx_sol",
Expand All @@ -74,7 +74,7 @@ class TokamakEquilibrium(Equilibrium):
"varied due to BOUT++ limitations"
),
value_type=int,
checks=is_positive,
check_all=is_positive,
),
nx_sol_outer=WithMeta(
"nx_sol",
Expand All @@ -83,61 +83,61 @@ class TokamakEquilibrium(Equilibrium):
"varied due to BOUT++ limitations"
),
value_type=int,
checks=is_positive,
check_all=is_positive,
),
ny_inner_divertor=WithMeta(
4,
doc="Number of poloidal points in the inner divertor(s)",
value_type=int,
checks=is_positive,
check_all=is_positive,
),
ny_inner_lower_divertor=WithMeta(
"ny_inner_divertor",
doc="Number of poloidal points in the inner, lower divertor",
value_type=int,
checks=is_positive,
check_all=is_positive,
),
ny_inner_upper_divertor=WithMeta(
"ny_inner_divertor",
doc="Number of poloidal points in the inner, upper divertor",
value_type=int,
checks=is_positive,
check_all=is_positive,
),
ny_outer_divertor=WithMeta(
4,
doc="Number of poloidal points in the outer divertor(s)",
value_type=int,
checks=is_positive,
check_all=is_positive,
),
ny_outer_lower_divertor=WithMeta(
"ny_outer_divertor",
doc="Number of poloidal points in the outer, lower divertor",
value_type=int,
checks=is_positive,
check_all=is_positive,
),
ny_outer_upper_divertor=WithMeta(
"ny_outer_divertor",
doc="Number of poloidal points in the outer, upper divertor",
value_type=int,
checks=is_positive,
check_all=is_positive,
),
ny_sol=WithMeta(
8,
doc="Number of poloidal points in the SOL upstream of the X-point(s)",
value_type=int,
checks=is_positive,
check_all=is_positive,
),
ny_inner_sol=WithMeta(
lambda options: options.ny_sol // 2,
doc="Number of poloidal points in the inner SOL upstream of the X-point(s)",
value_type=int,
checks=is_positive,
check_all=is_positive,
),
ny_outer_sol=WithMeta(
lambda options: options.ny_sol - options.ny_inner_sol,
doc="Number of poloidal points in the outer SOL upstream of the X-point(s)",
value_type=int,
checks=is_positive,
check_all=is_positive,
),
psinorm_core=WithMeta(
0.9,
Expand Down Expand Up @@ -228,7 +228,7 @@ class TokamakEquilibrium(Equilibrium):
"to be slightly displaced from the null so code can follow Grad(psi)."
),
value_type=float,
checks=[is_positive, lambda x: x < 1.0],
check_all=[is_positive, lambda x: x < 1.0],
),
)

Expand Down Expand Up @@ -381,7 +381,7 @@ def __init__(
super().__init__(nonorthogonal_settings)

# Print the table of options
print(optionsTableString(self.user_options))
print(self.user_options.as_table())

if make_regions:
# Create self.regions
Expand Down
16 changes: 8 additions & 8 deletions hypnotoad/cases/torpex.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,45 +63,45 @@ class TORPEXMagneticField(Equilibrium):
4,
doc="Number of radial points in the PFR regions",
value_type=int,
checks=is_positive,
check_all=is_positive,
),
nx_sol=WithMeta(
4,
doc="Number of radial points in the SOL regions",
value_type=int,
checks=is_positive,
check_all=is_positive,
),
ny_inner_lower_divertor=WithMeta(
4,
doc="Number of poloidal points in the inner, lower leg",
value_type=int,
checks=is_positive,
check_all=is_positive,
),
ny_inner_upper_divertor=WithMeta(
4,
doc="Number of poloidal points in the inner, upper leg",
value_type=int,
checks=is_positive,
check_all=is_positive,
),
ny_outer_upper_divertor=WithMeta(
4,
doc="Number of poloidal points in the outer, upper leg",
value_type=int,
checks=is_positive,
check_all=is_positive,
),
ny_outer_lower_divertor=WithMeta(
4,
doc="Number of poloidal points in the outer, lower leg",
value_type=int,
checks=is_positive,
check_all=is_positive,
),
psi_core=WithMeta(
None,
doc="psi value of the 'core' (used as default for PFR regions)",
value_type=float,
),
psi_sol=WithMeta(
None, doc="psi value of the SOL", value_type=float, checks=is_positive,
None, doc="psi value of the SOL", value_type=float, check_all=is_positive,
),
psi_sol_inner=WithMeta(
lambda options: options.psi_sol,
Expand Down Expand Up @@ -137,7 +137,7 @@ def __init__(self, equilibOptions, meshOptions):
numpy.abs((self.user_options.psi_core - self.user_options.psi_sol) / 20.0),
)

print(optionsTableString(self.user_options))
print(self.user_options.as_table())

# Call Equilibrium constructor after adding stuff to options
super().__init__(meshOptions)
Expand Down
Loading

0 comments on commit fcab586

Please sign in to comment.