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

Release/2.0.0 #199

Merged
merged 2 commits into from
Jan 9, 2020
Merged

Release/2.0.0 #199

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
730e2c3
remove a2d2c handling
bena-nasa Jan 9, 2020
35f769c
Merge pull request #198 from GEOS-ESM/feature/remove_a2d2c
atrayano Jan 9, 2020
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
23 changes: 0 additions & 23 deletions MAPL_Base/MAPL_AbstractGridFactory.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ module MAPL_AbstractGridFactoryMod

! from MAPL_stubs
procedure(halo), deferred :: halo
procedure :: A2D2C

procedure (generate_grid_name), deferred :: generate_grid_name
procedure :: to_string
Expand Down Expand Up @@ -248,28 +247,6 @@ function clone(this)

end function clone

subroutine A2D2C(this, u, v, lm, getC, unusable, rc)
use MAPL_KeywordEnforcerMod
class (AbstractGridFactory), intent(in) :: this
real, intent(inout) :: u(:,:,:)
real, intent(inout) :: v(:,:,:)
integer, intent(in) :: lm
logical, intent(in) :: getC
class (KeywordEnforcer), optional, intent(in) :: unusable
integer, optional, intent(out) :: rc

character(len=*), parameter :: Iam= MOD_NAME // 'A2D2C'

_UNUSED_DUMMY(this)
_UNUSED_DUMMY(u)
_UNUSED_DUMMY(v)
_UNUSED_DUMMY(lm)
_UNUSED_DUMMY(getC)
_UNUSED_DUMMY(unusable)
_RETURN(_FAILURE)

end subroutine A2D2C

function make_grid(this, unusable, rc) result(grid)
use esmf
use MAPL_KeywordEnforcerMod
Expand Down
27 changes: 0 additions & 27 deletions MAPL_Base/MAPL_GridManager.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,6 @@ module MAPL_GridManagerMod
public :: get_instance
public :: get_factory_id
public :: get_factory
public :: a2d2c

! singleton instance
type (GridManager), target, save :: grid_manager
Expand Down Expand Up @@ -569,30 +568,4 @@ function get_factory(grid, unusable, rc) result(factory)

end function get_factory

subroutine A2D2C(grid, u, v, lm, getC, unusable, rc)
type (ESMF_Grid), intent(in) :: grid
real, intent(inout) :: u(:,:,:)
real, intent(inout) :: v(:,:,:)
integer, intent(in) :: lm
logical, intent(in) :: getC
class (KeywordEnforcer), optional, intent(in) :: unusable
integer, optional, intent(out) :: rc

integer :: status
character(len=*), parameter :: Iam= MOD_NAME // 'get_a2d2c'
class (AbstractGridFactory), pointer :: factory

_UNUSED_DUMMY(unusable)
factory => grid_manager%get_factory(grid, rc=status)
_VERIFY(status)

call factory%a2d2c(u, v, lm, getC, rc=status)
_VERIFY(status)

_RETURN(_SUCCESS)

end subroutine A2D2C



end module MAPL_GridManagerMod