From a83b442f69357d9993fc914772c1c08be2fd8cc4 Mon Sep 17 00:00:00 2001 From: Luis Kornblueh <luis.kornblueh@mpimet.mpg.de> Date: Fri, 28 Jun 2019 13:46:06 +0200 Subject: [PATCH] Had to move calendar types --- src/libmtime.f90 | 12 ++++++------ src/mtime_constants.f90 | 7 +++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/libmtime.f90 b/src/libmtime.f90 index 2f3eb99b..a4b4618d 100644 --- a/src/libmtime.f90 +++ b/src/libmtime.f90 @@ -36,12 +36,12 @@ module mtime_calendar ! private ! - enum, bind(c) - enumerator :: calendar_not_set = 0 ! calendar is not defined yet - enumerator :: proleptic_gregorian = 1 ! proleptic Gregorian calendar - enumerator :: year_of_365_days = 2 ! 365 day year without leap years - enumerator :: year_of_360_days = 3 ! 360 day year with 30 day months - end enum + ! enum, bind(c) + ! enumerator :: calendar_not_set = 0 ! calendar is not defined yet + ! enumerator :: proleptic_gregorian = 1 ! proleptic Gregorian calendar + ! enumerator :: year_of_365_days = 2 ! 365 day year without leap years + ! enumerator :: year_of_360_days = 3 ! 360 day year with 30 day months + ! end enum ! public :: calendar_not_set, proleptic_gregorian, year_of_365_days, year_of_360_days public :: setCalendar diff --git a/src/mtime_constants.f90 b/src/mtime_constants.f90 index 0ffd2394..2ac15bc5 100644 --- a/src/mtime_constants.f90 +++ b/src/mtime_constants.f90 @@ -6,6 +6,13 @@ module mtime_constants public + enum, bind(c) + enumerator :: calendar_not_set = 0 ! calendar is not defined yet + enumerator :: proleptic_gregorian = 1 ! proleptic Gregorian calendar + enumerator :: year_of_365_days = 2 ! 365 day year without leap years + enumerator :: year_of_360_days = 3 ! 360 day year with 30 day months + end enum + integer(c_int), bind(c,name='NO_OF_SEC_IN_A_DAY') :: no_of_sec_in_a_day integer(c_int), bind(c,name='NO_OF_SEC_IN_A_HOUR') :: no_of_sec_in_a_hour integer(c_int), bind(c,name='NO_OF_SEC_IN_A_MINUTE') :: no_of_sec_in_a_minute -- GitLab