Skip to content

Commit f43a350

Browse files
committed
Prefix public EASE routines with MAPL_
1 parent 6ae0be5 commit f43a350

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/TileFile_ASCII_to_nc4.F90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
program TileFile_ASCII_to_nc4
99
use, intrinsic :: iso_fortran_env, only: REAL64
10-
use MAPL, only: MAPL_WriteTilingNC4, ease_extent
10+
use MAPL, only: MAPL_WriteTilingNC4, MAPL_ease_extent
1111
use LogRectRasterizeMod, only: MAPL_UNDEF_R8
1212

1313
implicit none
@@ -113,7 +113,7 @@ program TileFile_ASCII_to_nc4
113113
! rTable(:,4) is tile area fraction within grid cell (fr), convert to area;
114114
! get fr back in WriteTilingNC4
115115

116-
call ease_extent(gName1, tmp_in1, tmp_in2, cell_area=cell_area) ! get EASE grid cell area
116+
call MAPL_ease_extent(gName1, tmp_in1, tmp_in2, cell_area=cell_area) ! get EASE grid cell area
117117

118118
rTable(:,3) = rTable(:,4)*cell_area
119119
rTable(:,4) = cell_area

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/mkCatchParam.F90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ PROGRAM mkCatchParam
2121
!
2222
! Sarith Mahanama - March 23, 2012
2323
24-
use MAPL, only: ease_extent, MAPL_ReadTilingNC4
24+
use MAPL, only: MAPL_ease_extent, MAPL_ReadTilingNC4
2525
use rmTinyCatchParaMod
2626
use process_hres_data
2727
use MAPL_ExceptionHandling
@@ -193,7 +193,7 @@ PROGRAM mkCatchParam
193193

194194
if (index(Gridname,'EASEv') /=0) then
195195
! here Gridname has alias EASELabel
196-
call ease_extent(Gridname, nc_ease, nr_ease, _RC)
196+
call MAPL_ease_extent(Gridname, nc_ease, nr_ease, _RC)
197197
write(nc_string, '(i0)') nc_ease
198198
write(nr_string, '(i0)') nr_ease
199199
Gridname = trim(Gridname)//'_'//trim(nc_string)//'x'//trim(nr_string)

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/mkEASETilesParam.F90

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROGRAM mkEASETilesParam
3838
use MAPL_SortMod
3939
use MAPL_ConstantsMod, only : MAPL_PI_r8, MAPL_RADIUS
4040
use MAPL_ExceptionHandling
41-
use MAPL, only : ease_extent, ease_convert, ease_inverse, MAPL_WriteTilingNC4
41+
use MAPL, only : MAPL_ease_extent, MAPL_ease_convert, MAPL_ease_inverse, MAPL_WriteTilingNC4
4242
use netcdf
4343

4444
implicit none
@@ -157,7 +157,7 @@ PROGRAM mkEASETilesParam
157157

158158
EASElabel = trim(EASELabel_)
159159

160-
call ease_extent( EASELabel, nc_ease, nr_ease, _RC)
160+
call MAPL_ease_extent( EASELabel, nc_ease, nr_ease, _RC)
161161

162162
write(nc_string, '(i0)') nc_ease
163163
write(nr_string, '(i0)') nr_ease
@@ -883,20 +883,20 @@ PROGRAM mkEASETilesParam
883883
! get min/max lat/lon of EASE grid cell
884884
! BUG: This is *not* the desired min/max lat/lon of the land tile!!!
885885

886-
call EASE_inverse( EASELabel, real(ig-1), real(jg-1), clat, clon, _RC)
886+
call MAPL_ease_inverse( EASELabel, real(ig-1), real(jg-1), clat, clon, _RC)
887887

888888
mnx = clon - dx_ease
889889
mxx = clon + dx_ease
890890

891891
jgv = real(jg-1) + 0.5
892892

893-
call EASE_inverse( EASELabel, real(ig-1), jgv, clat, clon, _RC)
893+
call MAPL_ease_inverse( EASELabel, real(ig-1), jgv, clat, clon, _RC)
894894

895895
mny = clat
896896

897897
jgv = real(jg-1) - 0.5
898898

899-
call EASE_inverse( EASELabel, real(ig-1), jgv, clat, clon, _RC)
899+
call MAPL_ease_inverse( EASELabel, real(ig-1), jgv, clat, clon, _RC)
900900

901901
mxy = clat
902902

@@ -920,7 +920,7 @@ PROGRAM mkEASETilesParam
920920
! contributing raster grid cells, which is *not* the same for all EASE grid cells;
921921
! that is, cannot use exact (globally constant) area of EASE grid cell.
922922

923-
call EASE_inverse( EASELabel, real(ig-1), real(jg-1), clat, clon, _RC)
923+
call MAPL_ease_inverse( EASELabel, real(ig-1), real(jg-1), clat, clon, _RC)
924924

925925
fr_gcm = tile_area(nn) / ease_grid_area((jg-1)*nc_ease+ig)
926926

@@ -1031,7 +1031,7 @@ PROGRAM mkEASETilesParam
10311031
!!! do i = 1, nc_ease+1
10321032
!!! x = real(i-1) -0.5
10331033
!!! y = real(nr_ease - j)+0.5
1034-
!!! call EASE_inverse(MGRID, x, y, yout, xout)
1034+
!!! call MAPL_ease_inverse(MGRID, x, y, yout, xout)
10351035
!!! ys (i,j) = dble(yout)
10361036
!!! xs (i,j) = dble(xout)
10371037
!!! end do

0 commit comments

Comments
 (0)