From a452f39dc75b1cb683af9e33fc50f901292581f1 Mon Sep 17 00:00:00 2001 From: milancurcic Date: Thu, 9 Apr 2020 10:35:41 -0400 Subject: [PATCH 1/3] rename ESMF_FractionMod to WRF_ESMF_FractionMod --- external/esmf_time_f90/ESMF_Fraction.F90 | 6 +++--- external/esmf_time_f90/ESMF_Mod.F90 | 2 +- external/esmf_time_f90/ESMF_TimeInterval.F90 | 2 +- external/esmf_time_f90/Meat.F90 | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/external/esmf_time_f90/ESMF_Fraction.F90 b/external/esmf_time_f90/ESMF_Fraction.F90 index c6ce3aeb17..a9b276553f 100644 --- a/external/esmf_time_f90/ESMF_Fraction.F90 +++ b/external/esmf_time_f90/ESMF_Fraction.F90 @@ -4,7 +4,7 @@ !============================================================================== ! ! ESMF Fraction Module - module ESMF_FractionMod + module WRF_ESMF_FractionMod ! !============================================================================== ! @@ -17,7 +17,7 @@ module ESMF_FractionMod !=============================================================================== !BOPI ! -! !MODULE: ESMF_FractionMod +! !MODULE: WRF_ESMF_FractionMod ! ! !DESCRIPTION: ! Part of ESMF F90 API wrapper of C++ implemenation @@ -68,4 +68,4 @@ module ESMF_FractionMod !------------------------------------------------------------------------------ - end module ESMF_FractionMod + end module WRF_ESMF_FractionMod diff --git a/external/esmf_time_f90/ESMF_Mod.F90 b/external/esmf_time_f90/ESMF_Mod.F90 index c0c832f674..8392c57384 100644 --- a/external/esmf_time_f90/ESMF_Mod.F90 +++ b/external/esmf_time_f90/ESMF_Mod.F90 @@ -6,7 +6,7 @@ MODULE ESMF_Mod USE WRF_ESMF_BaseTimeMod USE WRF_ESMF_CalendarMod USE WRF_ESMF_ClockMod - USE esmf_fractionmod + USE WRF_ESMF_FractionMod USE WRF_ESMF_TimeIntervalMod USE WRF_ESMF_TimeMod USE WRF_ESMF_AlarmClockMod diff --git a/external/esmf_time_f90/ESMF_TimeInterval.F90 b/external/esmf_time_f90/ESMF_TimeInterval.F90 index 238b327a1b..43ffd14fb2 100644 --- a/external/esmf_time_f90/ESMF_TimeInterval.F90 +++ b/external/esmf_time_f90/ESMF_TimeInterval.F90 @@ -34,7 +34,7 @@ module WRF_ESMF_TimeIntervalMod use WRF_ESMF_BaseTimeMod ! associated derived types - use ESMF_FractionMod, only : ESMF_Fraction + use WRF_ESMF_FractionMod, only : ESMF_Fraction use WRF_ESMF_CalendarMod implicit none diff --git a/external/esmf_time_f90/Meat.F90 b/external/esmf_time_f90/Meat.F90 index 0cc58ba2a2..9aea197968 100644 --- a/external/esmf_time_f90/Meat.F90 +++ b/external/esmf_time_f90/Meat.F90 @@ -562,7 +562,7 @@ SUBROUTINE c_esmc_basetimeeq (time1, time2, outflag) USE WRF_ESMF_BaseTimeMod USE WRF_ESMF_CalendarMod USE WRF_ESMF_ClockMod - USE esmf_fractionmod + USE WRF_ESMF_FractionMod USE WRF_ESMF_TimeIntervalMod USE WRF_ESMF_TimeMod IMPLICIT NONE @@ -579,7 +579,7 @@ SUBROUTINE c_esmc_basetimege(time1, time2, outflag) USE WRF_ESMF_BaseTimeMod USE WRF_ESMF_CalendarMod USE WRF_ESMF_ClockMod - USE esmf_fractionmod + USE WRF_ESMF_FractionMod USE WRF_ESMF_TimeIntervalMod USE WRF_ESMF_TimeMod logical, intent(OUT) :: outflag @@ -595,7 +595,7 @@ SUBROUTINE c_esmc_basetimegt(time1, time2, outflag) USE WRF_ESMF_BaseTimeMod USE WRF_ESMF_CalendarMod USE WRF_ESMF_ClockMod - USE esmf_fractionmod + USE WRF_ESMF_FractionMod USE WRF_ESMF_TimeIntervalMod USE WRF_ESMF_TimeMod IMPLICIT NONE @@ -612,7 +612,7 @@ SUBROUTINE c_esmc_basetimele(time1, time2, outflag) USE WRF_ESMF_BaseTimeMod USE WRF_ESMF_CalendarMod USE WRF_ESMF_ClockMod - USE esmf_fractionmod + USE WRF_ESMF_FractionMod USE WRF_ESMF_TimeIntervalMod USE WRF_ESMF_TimeMod IMPLICIT NONE @@ -629,7 +629,7 @@ SUBROUTINE c_esmc_basetimelt(time1, time2, outflag) USE WRF_ESMF_BaseTimeMod USE WRF_ESMF_CalendarMod USE WRF_ESMF_ClockMod - USE esmf_fractionmod + USE WRF_ESMF_FractionMod USE WRF_ESMF_TimeIntervalMod USE WRF_ESMF_TimeMod IMPLICIT NONE @@ -646,7 +646,7 @@ SUBROUTINE c_esmc_basetimene(time1, time2, outflag) USE WRF_ESMF_BaseTimeMod USE WRF_ESMF_CalendarMod USE WRF_ESMF_ClockMod - USE esmf_fractionmod + USE WRF_ESMF_FractionMod USE WRF_ESMF_TimeIntervalMod USE WRF_ESMF_TimeMod IMPLICIT NONE From 35fe35bc10345cb75a68ccd896abf75ba492a9ba Mon Sep 17 00:00:00 2001 From: Dave Gill Date: Thu, 9 Apr 2020 15:49:38 -0600 Subject: [PATCH 2/3] jenkins test --- dyn_em/solve_em.F | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dyn_em/solve_em.F b/dyn_em/solve_em.F index 53c0f5dd13..fd41928707 100644 --- a/dyn_em/solve_em.F +++ b/dyn_em/solve_em.F @@ -1,4 +1,4 @@ -!WRF:MEDIATION_LAYER:SOLVER +! WRF:MEDIATION_LAYER:SOLVER SUBROUTINE solve_em ( grid , config_flags & ! Arguments generated from Registry From c241a655524b7883d8947b9963ddeb469a36aaa7 Mon Sep 17 00:00:00 2001 From: Dave Gill Date: Fri, 10 Apr 2020 09:32:08 -0600 Subject: [PATCH 3/3] Update solve_em.F --- dyn_em/solve_em.F | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dyn_em/solve_em.F b/dyn_em/solve_em.F index fd41928707..53c0f5dd13 100644 --- a/dyn_em/solve_em.F +++ b/dyn_em/solve_em.F @@ -1,4 +1,4 @@ -! WRF:MEDIATION_LAYER:SOLVER +!WRF:MEDIATION_LAYER:SOLVER SUBROUTINE solve_em ( grid , config_flags & ! Arguments generated from Registry