Skip to content

Port OVP.F90 off MAPL_GenericMod to MAPL3 #419

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
mathomp4 merged 2 commits into from
May 1, 2026
Merged

Port OVP.F90 off MAPL_GenericMod to MAPL3 #419

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
cdc12c9
Port OVP.F90 off MAPL_GenericMod to MAPL3
tclune Apr 30, 2026
a0c45d4
Fix OVP.F90: add explicit use MAPLBase_mod for symbols not in mapl3g
tclune Apr 30, 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 GEOS_Shared/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set (srcs
getco2.F90 atmOceanIntLayer.F90
)

esma_add_library(${this} SRCS ${srcs} DEPENDENCIES MAPL2 MAPL ESMF::ESMF NetCDF::NetCDF_Fortran)
esma_add_library(${this} SRCS ${srcs} DEPENDENCIES MAPL2 MAPL MAPL.geom ESMF::ESMF NetCDF::NetCDF_Fortran)

# special cases
set_source_files_properties(sphere.F PROPERTIES COMPILE_FLAGS "${FREAL8}")
Expand Down
17 changes: 10 additions & 7 deletions GEOS_Shared/OVP.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "MAPL_Generic.h"
#include "MAPL.h"

!BOP

Expand All @@ -13,7 +13,9 @@ module OVP
! !USES:

use ESMF
use MAPL2
use MAPL
use MAPLBase_mod, only: MAPL_AM_I_ROOT, MAPL_PI_R8, MAPL_PackTime
use mapl3g_GridGet, only: GridGetCoordinates

implicit none
private
Expand Down Expand Up @@ -72,7 +74,7 @@ subroutine OVP_init ( GC, GC_DT_LABEL, LONS, RUN_DT, GC_DT, RC )
TYPE(ESMF_GridComp), INTENT(inout) :: GC ! Gridded component
CHARACTER(len=*), INTENT(in) :: GC_DT_LABEL ! String to get the GridComp-specific timestep

REAL(ESMF_KIND_R4), POINTER, INTENT(out) :: LONS(:,:) ! radians
REAL(ESMF_KIND_R8), POINTER, INTENT(out) :: LONS(:,:) ! radians
INTEGER, INTENT(out) :: RUN_DT ! main timestep (seconds)
INTEGER, INTENT(out) :: GC_DT ! GridComp timestep (seconds)
INTEGER, OPTIONAL, INTENT(out) :: RC ! Error code
Expand Down Expand Up @@ -103,7 +105,8 @@ subroutine OVP_init ( GC, GC_DT_LABEL, LONS, RUN_DT, GC_DT, RC )
CHARACTER(len=ESMF_MAXSTR) :: IAm
INTEGER :: STATUS

type (MAPL_MetaComp), pointer :: STATE
type(ESMF_Grid) :: grid
REAL(ESMF_KIND_R8), pointer :: lats(:,:)
TYPE (ESMF_Config) :: CF
REAL :: dt1, dt2

Expand All @@ -112,9 +115,9 @@ subroutine OVP_init ( GC, GC_DT_LABEL, LONS, RUN_DT, GC_DT, RC )

IAm = "OVP_init"

call MAPL_GetObjectFromGC ( GC, STATE, __RC__ ) ! Get MAPL state
call MAPL_GridCompGet(GC, grid=grid, _RC)

call MAPL_Get( STATE, LONS=LONS, __RC__ ) ! Get LONS
call GridGetCoordinates(grid, LONS, lats, _RC) ! Get LONS

call ESMF_GridCompGet ( GC, CONFIG=CF, __RC__ ) ! Get Config

Expand Down Expand Up @@ -142,7 +145,7 @@ subroutine OVP_mask ( LONS, DELTA_TIME, OVERPASS_HOUR, MASK )

! !ARGUMENTS

REAL, INTENT(IN) :: LONS(:,:) ! radians
REAL(ESMF_KIND_R8), INTENT(IN) :: LONS(:,:) ! radians
INTEGER, INTENT(IN) :: DELTA_TIME ! seconds
INTEGER, INTENT(IN) :: OVERPASS_HOUR
INTEGER, ALLOCATABLE, INTENT(OUT) :: MASK(:,:) ! timestep closest to local overpass time, packed in hr/min/sec
Expand Down
Loading