Skip to content

Enabling WRF build with ESMF library #1066

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
davegill merged 5 commits into from
Jan 31, 2020
Merged

Enabling WRF build with ESMF library #1066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a0da5f
Fixing the issue of conflicts between ESMF interfaces used for WRF an…
negin513 Dec 11, 2019
b519499
Compiling WRF with ESMF library. This compiled successfully and call …
negin513 Dec 11, 2019
abd8d59
removed ESMF_initialize from module_surface_driver.F used only for
negin513 Jan 27, 2020
c940b1c
removing the temporary configure file we don't need now!
negin513 Jan 27, 2020
d7d2b00
Line up text, mostly to trigger Jenkins
davegill Jan 29, 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
14 changes: 7 additions & 7 deletions external/esmf_time_f90/ESMF_Alarm.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
!==============================================================================
!
! ESMF Alarm Module
module ESMF_AlarmMod
module WRF_ESMF_AlarmMod
!
!==============================================================================
!
Expand All @@ -16,7 +16,7 @@ module ESMF_AlarmMod
!===============================================================================
!BOPI
!
! !MODULE: ESMF_AlarmMod
! !MODULE: WRF_ESMF_AlarmMod
!
! !DESCRIPTION:
! Part of Time Manager F90 API wrapper of C++ implemenation
Expand All @@ -29,12 +29,12 @@ module ESMF_AlarmMod
!------------------------------------------------------------------------------
! !USES:
! inherit from ESMF base class
use ESMF_BaseMod
use WRF_ESMF_BaseMod

! associated derived types
use ESMF_TimeIntervalMod, only : ESMF_TimeInterval, &
ESMF_TimeIntervalAbsValue
use ESMF_TimeMod, only : ESMF_Time
use WRF_ESMF_TimeIntervalMod, only : ESMF_TimeInterval, &
ESMF_TimeIntervalAbsValue
use WRF_ESMF_TimeMod, only : ESMF_Time

implicit none

Expand Down Expand Up @@ -952,4 +952,4 @@ end subroutine ESMF_AlarmPrint

!------------------------------------------------------------------------------

end module ESMF_AlarmMod
end module WRF_ESMF_AlarmMod
16 changes: 8 additions & 8 deletions external/esmf_time_f90/ESMF_AlarmClock.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
!==============================================================================
!
! ESMF Alarm-Clock Module
module ESMF_AlarmClockMod
module WRF_ESMF_AlarmClockMod
!
!==============================================================================
!
Expand All @@ -15,10 +15,10 @@ module ESMF_AlarmClockMod
!===============================================================================
!BOPI
!
! !MODULE: ESMF_AlarmClockMod
! !MODULE: WRF_ESMF_AlarmClockMod
!
! !DESCRIPTION:
! Separate module that uses both ESMF_AlarmMod and ESMF_ClockMod.
! Separate module that uses both WRF_ESMF_AlarmMod and WRF_ESMF_ClockMod.
! Separation is needed to avoid cyclic dependence.
!
! Defines F90 wrapper entry points for corresponding
Expand All @@ -29,12 +29,12 @@ module ESMF_AlarmClockMod
!------------------------------------------------------------------------------
! !USES:
! inherit ESMF_Alarm and ESMF_Clock
use ESMF_AlarmMod, only : ESMF_Alarm, ESMF_AlarmSet
use ESMF_ClockMod, only : ESMF_Clock, ESMF_ClockAddAlarm
use WRF_ESMF_AlarmMod, only : ESMF_Alarm, ESMF_AlarmSet
use WRF_ESMF_ClockMod, only : ESMF_Clock, ESMF_ClockAddAlarm

! associated derived types
use ESMF_TimeIntervalMod, only : ESMF_TimeInterval
use ESMF_TimeMod, only : ESMF_Time
use WRF_ESMF_TimeIntervalMod, only : ESMF_TimeInterval
use WRF_ESMF_TimeMod, only : ESMF_Time

implicit none

Expand Down Expand Up @@ -85,4 +85,4 @@ END FUNCTION ESMF_AlarmCreate

!------------------------------------------------------------------------------

end module ESMF_AlarmClockMod
end module WRF_ESMF_AlarmClockMod
6 changes: 3 additions & 3 deletions external/esmf_time_f90/ESMF_Base.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
!------------------------------------------------------------------------------
! module definition

module ESMF_BaseMod
module WRF_ESMF_BaseMod

!BOP
! !MODULE: ESMF_BaseMod - Base class for all ESMF classes
! !MODULE: WRF_ESMF_BaseMod - Base class for all ESMF classes
!
! !DESCRIPTION:
!
Expand Down Expand Up @@ -1081,4 +1081,4 @@ end subroutine ESMF_DataTypeString
! overridden by higher level more specialized functions.
!-------------------------------------------------------------------------

end module ESMF_BaseMod
end module WRF_ESMF_BaseMod
8 changes: 4 additions & 4 deletions external/esmf_time_f90/ESMF_BaseTime.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
!==============================================================================
!
! ESMF BaseTime Module
module ESMF_BaseTimeMod
module WRF_ESMF_BaseTimeMod
!
!==============================================================================
!
Expand All @@ -16,7 +16,7 @@ module ESMF_BaseTimeMod
!
!===============================================================================
!BOPI
! !MODULE: ESMF_BaseTimeMod - Base ESMF time definition
! !MODULE: WRF_ESMF_BaseTimeMod - Base ESMF time definition
!
! !DESCRIPTION:
! Part of Time Manager F90 API wrapper of C++ implemenation
Expand All @@ -28,7 +28,7 @@ module ESMF_BaseTimeMod
!
!------------------------------------------------------------------------------
! !USES:
use ESMF_BaseMod ! ESMF Base class
use WRF_ESMF_BaseMod ! ESMF Base class
implicit none
!
!------------------------------------------------------------------------------
Expand Down Expand Up @@ -307,4 +307,4 @@ FUNCTION ESMF_BaseTimeGE( basetime1, basetime2 )
END FUNCTION ESMF_BaseTimeGE


end module ESMF_BaseTimeMod
end module WRF_ESMF_BaseTimeMod
10 changes: 5 additions & 5 deletions external/esmf_time_f90/ESMF_Calendar.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
!==============================================================================
!
! ESMF Calendar Module
module ESMF_CalendarMod
module WRF_ESMF_CalendarMod
!
!==============================================================================
!
Expand All @@ -15,7 +15,7 @@ module ESMF_CalendarMod

!==============================================================================
!BOPI
! !MODULE: ESMF_CalendarMod
! !MODULE: WRF_ESMF_CalendarMod
!
! !DESCRIPTION:
! Part of Time Manager F90 API wrapper of C++ implemenation
Expand All @@ -28,10 +28,10 @@ module ESMF_CalendarMod
!------------------------------------------------------------------------------
! !USES:
! inherit from ESMF base class
use ESMF_BaseMod
use WRF_ESMF_BaseMod

! inherit from base time class
use ESMF_BaseTimeMod
use WRF_ESMF_BaseTimeMod

implicit none
!
Expand Down Expand Up @@ -273,4 +273,4 @@ function ESMF_CalendarInitialized(calendar)

end function ESMF_CalendarInitialized

end module ESMF_CalendarMod
end module WRF_ESMF_CalendarMod
18 changes: 9 additions & 9 deletions external/esmf_time_f90/ESMF_Clock.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
!==============================================================================
!
! ESMF Clock Module
module ESMF_ClockMod
module WRF_ESMF_ClockMod
!
!==============================================================================
!
Expand All @@ -14,7 +14,7 @@ module ESMF_ClockMod

!==============================================================================
!BOPI
! !MODULE: ESMF_ClockMod
! !MODULE: WRF_ESMF_ClockMod
!
! !DESCRIPTION:
! Part of Time Manager F90 API wrapper of C++ implemenation
Expand All @@ -27,13 +27,13 @@ module ESMF_ClockMod
!------------------------------------------------------------------------------
! !USES:
! inherit from ESMF base class
use ESMF_BaseMod
use WRF_ESMF_BaseMod

! associated derived types
use ESMF_TimeIntervalMod ! , only : ESMF_TimeInterval, &
use WRF_ESMF_TimeIntervalMod ! , only : ESMF_TimeInterval, &
! ESMF_TimeIntervalIsPositive
use ESMF_TimeMod ! , only : ESMF_Time
use ESMF_AlarmMod, only : ESMF_Alarm
use WRF_ESMF_TimeMod ! , only : ESMF_Time
use WRF_ESMF_AlarmMod, only : ESMF_Alarm

implicit none
!
Expand Down Expand Up @@ -98,7 +98,7 @@ module ESMF_ClockMod
! public ESMF_ClockGetPrevTime
! public ESMF_ClockGetCurrSimTime
! public ESMF_ClockGetPrevSimTime
! This must be public for ESMF_AlarmClockMod...
! This must be public for WRF_ESMF_AlarmClockMod...
public ESMF_ClockAddAlarm
public ESMF_ClockGetAlarmList
! public ESMF_ClockGetNumAlarms
Expand Down Expand Up @@ -887,7 +887,7 @@ end subroutine ESMF_ClockSyncToWallClock
subroutine ESMF_ClockAdvance(clock, RingingAlarmList, &
NumRingingAlarms, rc)

use esmf_timemod
use WRF_ESMF_TimeMod

! !ARGUMENTS:
type(ESMF_Clock), intent(inout) :: clock
Expand Down Expand Up @@ -1339,4 +1339,4 @@ end subroutine ESMF_ClockPrint

!------------------------------------------------------------------------------

end module ESMF_ClockMod
end module WRF_ESMF_ClockMod
18 changes: 9 additions & 9 deletions external/esmf_time_f90/ESMF_Mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
! TBH: This version is for use with the ESMF library embedded in the WRF
! TBH: distribution.
MODULE ESMF_Mod
USE esmf_alarmmod
USE esmf_basemod
USE esmf_basetimemod
USE esmf_calendarmod
USE esmf_clockmod
USE WRF_ESMF_AlarmMod
USE WRF_ESMF_BaseMod
USE WRF_ESMF_BaseTimeMod
USE WRF_ESMF_CalendarMod
USE WRF_ESMF_ClockMod
USE esmf_fractionmod
USE esmf_timeintervalmod
USE esmf_timemod
USE esmf_alarmclockmod
USE esmf_stubs ! add new dummy interfaces and typedefs here as needed
USE WRF_ESMF_TimeIntervalMod
USE WRF_ESMF_TimeMod
USE WRF_ESMF_AlarmClockMod
USE WRF_ESMF_Stubs ! add new dummy interfaces and typedefs here as needed
#include <ESMF_TimeMgr.inc>
INTEGER, PARAMETER :: ESMF_MAX_ALARMS=MAX_ALARMS
!
Expand Down
12 changes: 6 additions & 6 deletions external/esmf_time_f90/ESMF_Stubs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
! mimicking newer ESMF interface features without necessarily implementing
! them.

MODULE ESMF_Stubs
MODULE WRF_ESMF_Stubs

IMPLICIT NONE

Expand Down Expand Up @@ -49,8 +49,8 @@ MODULE ESMF_Stubs

! NOOP
SUBROUTINE ESMF_Initialize( vm, defaultcalkind, rc )
USE esmf_basemod
USE esmf_calendarmod
USE WRF_ESMF_BaseMod
USE WRF_ESMF_CalendarMod
TYPE(ESMF_VM), INTENT(IN ), OPTIONAL :: vm
TYPE(ESMF_CalendarType), INTENT(IN ), OPTIONAL :: defaultcalkind
INTEGER, INTENT( OUT), OPTIONAL :: rc
Expand Down Expand Up @@ -90,7 +90,7 @@ END FUNCTION ESMF_IsInitialized

! NOOP
SUBROUTINE ESMF_Finalize( rc )
USE esmf_basemod
USE WRF_ESMF_BaseMod
INTEGER, INTENT( OUT), OPTIONAL :: rc
#if (defined SPMD) || (defined COUP_CSM)
#include <mpif.h>
Expand All @@ -115,7 +115,7 @@ END SUBROUTINE ESMF_Finalize

! NOOP
SUBROUTINE ESMF_LogWrite( msg, MsgType, line, file, method, log, rc )
USE esmf_basemod
USE WRF_ESMF_BaseMod
CHARACTER(LEN=*), INTENT(IN) :: msg
TYPE(ESMF_MsgType), INTENT(IN) :: msgtype
INTEGER, INTENT(IN), OPTIONAL :: line
Expand All @@ -127,6 +127,6 @@ SUBROUTINE ESMF_LogWrite( msg, MsgType, line, file, method, log, rc )
END SUBROUTINE ESMF_LogWrite


END MODULE ESMF_Stubs
END MODULE WRF_ESMF_Stubs


16 changes: 8 additions & 8 deletions external/esmf_time_f90/ESMF_Time.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
!==============================================================================
!
! ESMF Time Module
module ESMF_TimeMod
module WRF_ESMF_TimeMod
!
!==============================================================================
!
Expand All @@ -14,7 +14,7 @@ module ESMF_TimeMod

!==============================================================================
!BOPI
! !MODULE: ESMF_TimeMod
! !MODULE: WRF_ESMF_TimeMod
!
! !DESCRIPTION:
! Part of Time Manager F90 API wrapper of C++ implemenation
Expand All @@ -27,15 +27,15 @@ module ESMF_TimeMod
!------------------------------------------------------------------------------
! !USES:
! inherit from ESMF base class
use ESMF_BaseMod
use WRF_ESMF_BaseMod

! inherit from base time class
use ESMF_BaseTimeMod
use WRF_ESMF_BaseTimeMod

! associated derived types
use ESMF_TimeIntervalMod
use ESMF_CalendarMod
use ESMF_Stubs
use WRF_ESMF_TimeIntervalMod
use WRF_ESMF_CalendarMod
use WRF_ESMF_Stubs

implicit none
!
Expand Down Expand Up @@ -1177,4 +1177,4 @@ subroutine ESMF_TimeCopy(timeout, timein)

end subroutine ESMF_TimeCopy

end module ESMF_TimeMod
end module WRF_ESMF_TimeMod
12 changes: 6 additions & 6 deletions external/esmf_time_f90/ESMF_TimeInterval.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
!==============================================================================
!
! ESMF TimeInterval Module
module ESMF_TimeIntervalMod
module WRF_ESMF_TimeIntervalMod
!
!==============================================================================
!
Expand All @@ -15,7 +15,7 @@ module ESMF_TimeIntervalMod
!
!===============================================================================
!BOPI
! !MODULE: ESMF_TimeIntervalMod
! !MODULE: WRF_ESMF_TimeIntervalMod
!
! !DESCRIPTION:
! Part of Time Manager F90 API wrapper of C++ implemenation
Expand All @@ -28,14 +28,14 @@ module ESMF_TimeIntervalMod
!------------------------------------------------------------------------------
! !USES:
! inherit from ESMF base class
use ESMF_BaseMod
use WRF_ESMF_BaseMod

! inherit from base time class
use ESMF_BaseTimeMod
use WRF_ESMF_BaseTimeMod

! associated derived types
use ESMF_FractionMod, only : ESMF_Fraction
use ESMF_CalendarMod
use WRF_ESMF_CalendarMod

implicit none
!
Expand Down Expand Up @@ -1255,6 +1255,6 @@ function ESMF_TimeIntervalIsPositive(timeinterval)
zerotimeint )
end function ESMF_TimeIntervalIsPositive

end module ESMF_TimeIntervalMod
end module WRF_ESMF_TimeIntervalMod


Loading