Skip to content

Commit 04f00bb

Browse files
authored
Remove MAPL_GetPointer, GET_POINTER, MAPL_FieldGetPointer from Base (#4827)
Remove legacy macros and their underlying implementations: - GET_POINTER / MAPL_GetPointer (-> ESMFL_StateGetPointerToData): last external caller (GEOS_GigatrajGridComp) migrated to MAPL_StateGetPointer in GEOSgcm_GridComp#1404 - MAPL_FieldGetPointer (-> ESMFL_FieldGetPointerToData): zero callers Removes from include/MAPL.h: GET_POINTER, MAPL_GetPointer, MAPL_FieldGetPointer macro definitions Removes from base/ESMFL_Mod.F90: public ESMFL_StateGetPointerToData public ESMFL_FieldGetPointerToData ESMFL_StateGetPointerToData interface block + 8x GetPointer.H includes ESMFL_FieldGetPointerToData interface block + 8x GetFieldArray.H includes ESMFL_BundleGetPointerToData is retained (active callers remain). Closes #4825
1 parent 616bd72 commit 04f00bb

2 files changed

Lines changed: 0 additions & 57 deletions

File tree

base/ESMFL_Mod.F90

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ module ESMFL_MOD
4848
!PUBLIC MEMBER FUNCTIONS:
4949
public ESMFL_StateGetField
5050
public ESMFL_StateGetFieldArray
51-
public ESMFL_StateGetPointerToData
52-
public ESMFL_FieldGetPointerToData
5351
public ESMFL_BundleGetPointerToData
5452
public ESMFL_BundleCpyField
5553
public ESMFL_GridCoordGet
@@ -120,28 +118,6 @@ module ESMFL_MOD
120118
module procedure BundleAddState_
121119
end interface
122120

123-
interface ESMFL_StateGetPointerToData
124-
module procedure ESMFL_StateGetPtrToDataR4_1
125-
module procedure ESMFL_StateGetPtrToDataR4_2
126-
module procedure ESMFL_StateGetPtrToDataR4_3
127-
module procedure ESMFL_StateGetPtrToDataR4_4
128-
module procedure ESMFL_StateGetPtrToDataR8_1
129-
module procedure ESMFL_StateGetPtrToDataR8_2
130-
module procedure ESMFL_StateGetPtrToDataR8_3
131-
module procedure ESMFL_StateGetPtrToDataR8_4
132-
end interface
133-
134-
interface ESMFL_FieldGetPointerToData
135-
module procedure ESMFL_FieldGetPtrToDataR4_1
136-
module procedure ESMFL_FieldGetPtrToDataR4_2
137-
module procedure ESMFL_FieldGetPtrToDataR4_3
138-
module procedure ESMFL_FieldGetPtrToDataR4_4
139-
module procedure ESMFL_FieldGetPtrToDataR8_1
140-
module procedure ESMFL_FieldGetPtrToDataR8_2
141-
module procedure ESMFL_FieldGetPtrToDataR8_3
142-
module procedure ESMFL_FieldGetPtrToDataR8_4
143-
end interface
144-
145121
interface ESMFL_BundleGetPointerToData
146122
module procedure ESMFL_BundleGetPointerByIndex2
147123
module procedure ESMFL_BundleGetPointerByIndex3
@@ -607,32 +583,6 @@ end function ESMFL_StateFieldIsNeeded
607583
#undef VARTYPE_
608584

609585

610-
#define VARTYPE_ 3
611-
612-
#define RANK_ 1
613-
#include "GetPointer.H"
614-
#define RANK_ 2
615-
#include "GetPointer.H"
616-
#define RANK_ 3
617-
#include "GetPointer.H"
618-
#define RANK_ 4
619-
#include "GetPointer.H"
620-
621-
#undef VARTYPE_
622-
623-
#define VARTYPE_ 4
624-
625-
#define RANK_ 1
626-
#include "GetPointer.H"
627-
#define RANK_ 2
628-
#include "GetPointer.H"
629-
#define RANK_ 3
630-
#include "GetPointer.H"
631-
#define RANK_ 4
632-
#include "GetPointer.H"
633-
634-
#undef VARTYPE_
635-
636586
subroutine AdjustPtrBounds1dr4(PTR, A, I1, IN)
637587
real(KIND=ESMF_KIND_R4), pointer :: PTR(:)
638588
integer :: I1, IN

include/MAPL.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@
33
#include "MAPL_ErrLog.h"
44
#include "unused_dummy.H"
55

6-
#undef GET_POINTER
7-
#define GET_POINTER ESMFL_StateGetPointerToData
8-
#undef MAPL_GetPointer
9-
#define MAPL_GetPointer ESMFL_StateGetPointerToData
10-
#undef MAPL_FieldGetPointer
11-
#define MAPL_FieldGetPointer ESMFL_FieldGetPointerToData
12-
136
#ifdef GR8
147

158
#define MAPL_real real(MAPL_R8)

0 commit comments

Comments
 (0)