Skip to content

Fix jedi config #264

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

Open
mo-rickywong wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix jedi config #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3db0c57
Add fixes thatjedi falls foul of
mo-rickywong Feb 4, 2026
bbaaab8
Merge branch 'main' into FixJediConfig
mo-rickywong Feb 4, 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
2 changes: 1 addition & 1 deletion infrastructure/build/tools/configurator/templates/config_type.f90.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ subroutine clear(self)
! Namlists which may have multiple instances per configuration
{%- for i in range(namelists|length) %}
{%- if duplicates[i] %}
call self%{{namelists[i]}}%clear()
if (allocated(self%{{namelists[i]}})) call self%{{namelists[i]}}%clear()
{%- endif %}
{%- endfor %}
{% for i in range(namelists|length) %}
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/build/tools/configurator/templates/namelist_iterator_type.f90.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
!> @details Provides functionality for iteratively returning every member
!> of the defined namelist ({{listname}}) collection. The order of
!> the namelists returned is not defined and can change if the
!> implementation of the namelist collection is changes.
!> implementation of the namelist collection is changed.
!
module {{listname}}_nml_iterator_mod

Expand Down
4 changes: 2 additions & 2 deletions infrastructure/build/tools/configurator/tests/app_config/content_mod.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,8 +434,8 @@ subroutine clear(self)
class(config_type), intent(inout) :: self

! Namlists which may have multiple instances per configuration
call self%bar%clear()
call self%pot%clear()
if (allocated(self%bar)) call self%bar%clear()
if (allocated(self%pot)) call self%pot%clear()

if (allocated(self%foo)) deallocate(self%foo)
if (allocated(self%bar)) deallocate(self%bar)
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/build/tools/configurator/tests/app_config/pot_nml_iterator_mod.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
!> @details Provides functionality for iteratively returning every member
!> of the defined namelist (pot) collection. The order of
!> the namelists returned is not defined and can change if the
!> implementation of the namelist collection is changes.
!> implementation of the namelist collection is changed.
!
module pot_nml_iterator_mod

Expand Down
Loading