Skip to content
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

Jump to bottom

Resolve gfortran segfault issue with vertical regridding tests #3195

Merged
merged 11 commits into from
Dec 2, 2024
Merged

Resolve gfortran segfault issue with vertical regridding tests #3195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
69e0e64
Printing spec
pchakraborty Nov 25, 2024
93deada
Merge remote-tracking branch 'origin/release/MAPL-v3' into bug/pchakr…
pchakraborty Nov 27, 2024
2a6d68c
gfortran has trouble with type bound write overload - deactivating it
pchakraborty Nov 27, 2024
49747b6
Scenarios tests vertical_regridding_2/3 are now active
pchakraborty Nov 27, 2024
742bbd4
FixedLevels/ModelVerticalGrid - reverting back to original write over…
pchakraborty Nov 27, 2024
7e90fd8
Merge branch 'release/MAPL-v3' into bug/pchakrab/vertical-regridding-…
pchakraborty Nov 27, 2024
0b24b7a
Turns out that we need to ifdef only the generic statement
pchakraborty Dec 2, 2024
50eb3cd
Cleaned up - removed commented ifdef's
pchakraborty Dec 2, 2024
7f97efd
Merge remote-tracking branch 'origin/release/MAPL-v3' into bug/pchakr…
pchakraborty Dec 2, 2024
08b66c6
Merge branch 'release/MAPL-v3' into bug/pchakrab/vertical-regridding-…
tclune Dec 2, 2024
fe97770
Merge branch 'release/MAPL-v3' into bug/pchakrab/vertical-regridding-…
pchakraborty Dec 2, 2024
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
12 changes: 6 additions & 6 deletions generic3g/specs/FieldSpec.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,19 +356,19 @@ subroutine write_formatted(this, unit, iotype, v_list, iostat, iomsg)
integer, intent(out) :: iostat
character(*), intent(inout) :: iomsg

write(unit, "(a, a)", iostat=iostat, iomsg=iomsg) "FieldSpec(", new_line("a")
write(unit, "(a)", iostat=iostat, iomsg=iomsg) "FieldSpec("
if (allocated(this%standard_name)) then
write(unit, "(3x, a, a, a)", iostat=iostat, iomsg=iomsg) "standard name:", this%standard_name, new_line("a")
write(unit, "(a, a, a)", iostat=iostat, iomsg=iomsg) new_line("a"), "standard name:", this%standard_name
end if
if (allocated(this%long_name)) then
write(unit, "(3x, a, a, a)", iostat=iostat, iomsg=iomsg) "long name:", this%long_name, new_line("a")
write(unit, "(a, a, a)", iostat=iostat, iomsg=iomsg) new_line("a"), "long name:", this%long_name
end if
if (allocated(this%units)) then
write(unit, "(3x, a, a, a)", iostat=iostat, iomsg=iomsg) "units:", this%units, new_line("a")
write(unit, "(a, a, a)", iostat=iostat, iomsg=iomsg) new_line("a"), "units:", this%units
end if
write(unit, "(3x, dt'g0', a)", iostat=iostat, iomsg=iomsg) this%vertical_dim_spec, new_line("a")
write(unit, "(a, dt'g0')", iostat=iostat, iomsg=iomsg) new_line("a"), this%vertical_dim_spec
if (allocated(this%vertical_grid)) then
write(unit, "(3x, dt'g0', a)", iostat=iostat, iomsg=iomsg) this%vertical_grid
write(unit, "(a, dt'g0', a)", iostat=iostat, iomsg=iomsg) new_line("a"), this%vertical_grid
end if
write(unit, "(a)") ")"

Expand Down
1 change: 0 additions & 1 deletion generic3g/specs/InvalidSpec.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ module mapl3g_InvalidSpec
procedure :: set_geometry => set_geometry

procedure :: write_formatted

procedure :: make_adapters
end type InvalidSpec

Expand Down
2 changes: 2 additions & 0 deletions generic3g/specs/StateItemSpec.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ module mapl3g_StateItemSpec
procedure(I_set_geometry), deferred :: set_geometry

procedure(I_write_formatted), deferred :: write_formatted
#ifndef __GFORTRAN__
generic :: write(formatted) => write_formatted
#endif

procedure, non_overridable :: set_allocated
procedure, non_overridable :: is_allocated
Expand Down
5 changes: 1 addition & 4 deletions generic3g/tests/Test_Scenarios.pf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,9 @@ contains
ScenarioDescription('export_dependency', 'parent.yaml', check_name, check_stateitem), &
ScenarioDescription('regrid', 'cap.yaml', check_name, check_stateitem), &
ScenarioDescription('propagate_geom', 'parent.yaml', check_name, check_stateitem), &
ScenarioDescription('vertical_regridding', 'parent.yaml', check_name, check_stateitem) &
#ifndef __GFORTRAN__
, &
ScenarioDescription('vertical_regridding', 'parent.yaml', check_name, check_stateitem), &
ScenarioDescription('vertical_regridding_2', 'parent.yaml', check_name, check_stateitem), &
ScenarioDescription('vertical_regridding_3', 'AGCM.yaml', check_name, check_stateitem) &
#endif
]
end function add_params

Expand Down
Loading