Skip to content

LHS inversion over full layer or cake if needed #39

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
jodemaey merged 26 commits into from
Mar 11, 2026
Merged

LHS inversion over full layer or cake if needed #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
aa44f69
Added capability to find other fields in LHSs and layers
jodemaey Feb 22, 2026
75c8a54
Linting
jodemaey Feb 22, 2026
67e7655
Removing the setting of field in lhs
jodemaey Feb 22, 2026
fd39ac4
Added the other fields in lhs property for equations
jodemaey Feb 28, 2026
928f508
Increasing Equation class clarity
jodemaey Feb 28, 2026
23a7664
Adding a property to get addition of inner products for the LHS
jodemaey Feb 28, 2026
827b0ad
Adapted layers to new equations org
jodemaey Feb 28, 2026
13f6f24
Cont'd
jodemaey Feb 28, 2026
b5b914a
Correcting a recursion bug
jodemaey Mar 1, 2026
b34c172
Comment
jodemaey Mar 1, 2026
f145e97
Correcting previous refactoring
jodemaey Mar 1, 2026
07df437
Cont'd
jodemaey Mar 1, 2026
357ef7e
Added possibility to have other fields from the same layer in the LHS…
jodemaey Mar 1, 2026
b8df654
Corrected a bug in new other fields in lhs property
jodemaey Mar 1, 2026
20962d8
Corrected same bug in parameter_fields property
jodemaey Mar 1, 2026
a620b24
Corrected inversion of layers LHS issues
jodemaey Mar 8, 2026
7fdd2f1
Cont'd
jodemaey Mar 9, 2026
51979dd
Error management
jodemaey Mar 10, 2026
381efb0
Added case when LHS inversion must be cake-wise
jodemaey Mar 10, 2026
c7c9d77
Cont'd (to be tested)
jodemaey Mar 10, 2026
7019135
Solving LHS inversion logic
jodemaey Mar 10, 2026
2bdd6d4
Cont'd
jodemaey Mar 10, 2026
ad0693a
Solved a bug and added a parameter to force LHS inversion at the cake…
jodemaey Mar 10, 2026
d7ab33b
Fixed bugs in the cake LHS inversion
jodemaey Mar 10, 2026
26d2fa0
Corrected a bug due to weird sympy matrix indexing
jodemaey Mar 11, 2026
ad51c88
Dealing again with errors and logic
jodemaey Mar 11, 2026
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
4 changes: 2 additions & 2 deletions examples/atmospheric/baroclinic_one_layer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@

# defining the LHS as the time derivative of the vorticity
vorticity = OperatorTerm(psi, Laplacian, atmospheric_basis.coordinate_system)
barotropic_equation = Equation(psi, lhs_term=vorticity)
barotropic_equation = Equation(psi, lhs_terms=vorticity)

# Defining the advection term
advection_term1 = vorticity_advection(psi, psi, atmospheric_basis.coordinate_system, sign=-1)
Expand Down Expand Up @@ -165,7 +165,7 @@

lin_lhs = LinearTerm(theta, prefactor=a, sign=-1)
lhs = AdditionOfTerms(lin_lhs, vorticity)
baroclinic_equation = Equation(theta, lhs_term=lhs)
baroclinic_equation = Equation(theta, lhs_terms=lhs)

# Defining the advection terms
advection_term1 = vorticity_advection(psi, theta, atmospheric_basis.coordinate_system, sign=-1)
Expand Down
2 changes: 1 addition & 1 deletion examples/atmospheric/barotropic_one_layer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@

# defining the LHS as the time derivative of the vorticity
vorticity = OperatorTerm(psi, Laplacian, basis.coordinate_system)
barotropic_equation = Equation(psi, lhs_term=vorticity)
barotropic_equation = Equation(psi, lhs_terms=vorticity)

# defining the advection term
advection_term = vorticity_advection(psi, psi, basis.coordinate_system, sign=-1)
Expand Down
2 changes: 1 addition & 1 deletion examples/atmospheric/stratospheric_planetary_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@

# defining the LHS as the time derivative of the vorticity
vorticity = OperatorTerm(psi, Laplacian, basis.coordinate_system)
planetary_equation = Equation(psi, lhs_term=vorticity)
planetary_equation = Equation(psi, lhs_terms=vorticity)

# defining the advection term
advection_term = vorticity_advection(psi, psi, basis.coordinate_system, sign=-1)
Expand Down
8 changes: 4 additions & 4 deletions examples/ocean-atmosphere/maooam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@

# defining LHS as the time derivative of the vorticity
vorticity = OperatorTerm(psi_a, Laplacian, atmospheric_basis.coordinate_system)
barotropic_equation = Equation(psi_a, lhs_term=vorticity)
barotropic_equation = Equation(psi_a, lhs_terms=vorticity)

# Defining the advection term
advection_term1 = vorticity_advection(psi_a, psi_a, atmospheric_basis.coordinate_system, sign=-1)
Expand Down Expand Up @@ -190,7 +190,7 @@

lin_lhs = LinearTerm(theta_a, prefactor=a, sign=-1)
lhs = AdditionOfTerms(lin_lhs, vorticity)
baroclinic_equation = Equation(theta_a, lhs_term=lhs)
baroclinic_equation = Equation(theta_a, lhs_terms=lhs)

# Defining the advection terms
advection_term1 = vorticity_advection(psi_a, theta_a, atmospheric_basis.coordinate_system, sign=-1)
Expand Down Expand Up @@ -250,7 +250,7 @@
vorticity = OperatorTerm(psi_o, Laplacian, oceanic_basis.coordinate_system)
lin_lhs = LinearTerm(psi_o, prefactor=G)
lhs = AdditionOfTerms(lin_lhs, vorticity)
oceanic_equation = Equation(psi_o, lhs_term=lhs)
oceanic_equation = Equation(psi_o, lhs_terms=lhs)

# Defining the advection term
advection_term = vorticity_advection(psi_o, psi_o, oceanic_basis.coordinate_system, sign=-1)
Expand Down Expand Up @@ -283,7 +283,7 @@

# Defining the LHS
lhs = LinearTerm(deltaT_o)
ocean_temperature_equation = Equation(deltaT_o, lhs_term=lhs)
ocean_temperature_equation = Equation(deltaT_o, lhs_terms=lhs)

# Defining the advection term
advection_term = Jacobian(psi_o, deltaT_o, oceanic_basis.coordinate_system, sign=-1)
Expand Down
Loading
Loading