Changeset 4144 for palm/trunk/SOURCE/date_and_time_mod.f90

Timestamp:

Aug 6, 2019 9:11:47 AM (5 years ago)

Author:

raasch

Message:

relational operators .EQ., .NE., etc. replaced by ==, /=, etc.

File:

• palm/trunk/SOURCE/date_and_time_mod.f90 (modified) (12 diffs)

palm/trunk/SOURCE/date_and_time_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! relational operators .EQ., .NE., etc. replaced by ==, /=, etc.
+! 
+! 3839 2019-03-28 21:12:25Z moh.hefny
 ! further tabs removed, unused variables removed
 ! 
@@ -191 +194 @@
 
           !> Condition for printing an error when date_init is not provided when day_of_year_init is not given in the namelist or when the format of the date is not the one required by PALM. 
-          IF ( day_of_month .GT. 0 .AND. day_of_month .LE. 31 .AND. month_of_year .GT. 0 .AND. month_of_year .LE. 12) THEN
+          IF ( day_of_month > 0 .AND. day_of_month <= 31 .AND. month_of_year > 0 .AND. month_of_year <= 12) THEN
         
              IF ( month_of_year == 1 ) THEN  !!month of year is read in input
@@ -226 +229 @@
 
          
-          IF ( day_of_year .LE. 31 ) THEN
+          IF ( day_of_year <= 31 ) THEN
 
              month_of_year=1
@@ -234 +237 @@
 
              DO i_mon=2,12   !january is considered in the first case
-                IF ( day_of_year .LE. SUM(days(1:i_mon)) .AND. day_of_year .GT. SUM(days(1:(i_mon-1))) ) THEN
+                IF ( day_of_year <= SUM(days(1:i_mon)) .AND. day_of_year > SUM(days(1:(i_mon-1))) ) THEN
            
                    month_of_year=i_mon
@@ -249 +252 @@
        !> in the second condition both day of month and month_of_year are either given in input (passed to date_init) or we are in some day successive to the initial one, so that day_of_month has already be computed in previous step
        !>TBD: something to calculate the current year is missing
-       ELSEIF ( day_of_month .GT. 0 .AND. day_of_month .LE. 31 .AND. month_of_year .GT. 0 .AND. month_of_year .LE. 12) THEN
+       ELSEIF ( day_of_month > 0 .AND. day_of_month <= 31 .AND. month_of_year > 0 .AND. month_of_year <= 12) THEN
  
           !> calculate month_of_year. TBD: test the condition when day_of_year==31
@@ -257 +260 @@
              month_of_year = 1
         
-          ELSE IF (day_of_year .GT. 1 .AND. day_of_year .GT. SUM(days(1:month_of_year))) THEN
+          ELSE IF (day_of_year > 1 .AND. day_of_year > SUM(days(1:month_of_year))) THEN
 
              month_of_year = month_of_year + 1
@@ -319 +322 @@
 
           !> Condition for printing an error when date_init is not provided when day_of_year_init is not given in the namelist or when the format of the date is not the one required by PALM. 
-          IF ( day_of_month .GT. 0 .AND. day_of_month .LE. 31 .AND. month_of_year .GT. 0 .AND. month_of_year .LE. 12) THEN
+          IF ( day_of_month > 0 .AND. day_of_month <= 31 .AND. month_of_year > 0 .AND. month_of_year <= 12) THEN
         
              IF ( month_of_year == 1 ) THEN  !!month of year is read in input
@@ -346 +349 @@
 
 !--    Calculate current day of the year !TBD: considetr leap years
-       IF ( (day_of_year_init + days_since_reference_point)  .GT. 365 ) THEN
+       IF ( (day_of_year_init + days_since_reference_point)  > 365 ) THEN
 
           day_of_year=INT(MOD((day_of_year_init + days_since_reference_point), 365.0_wp))
@@ -369 +372 @@
           !> The first case is when date_init is not provided: we only know day_of_year_init
           !DO i_mon=1,12
-             !IF (day_of_year .LE. SUM(days(1:i_mon))) THEN
-          IF ( day_of_year .LE. 31 ) THEN
+             !IF (day_of_year <= SUM(days(1:i_mon))) THEN
+          IF ( day_of_year <= 31 ) THEN
 
              month_of_year=1
@@ -378 +381 @@
 
              DO i_mon=2,12   !january is considered in the first case
-                IF ( day_of_year .LE. SUM(days(1:i_mon)) .AND. day_of_year .GT. SUM(days(1:(i_mon-1))) ) THEN
+                IF ( day_of_year <= SUM(days(1:i_mon)) .AND. day_of_year > SUM(days(1:(i_mon-1))) ) THEN
            
                    month_of_year=i_mon
@@ -393 +396 @@
        !> in the second condition both day of month and month_of_year are either given in input (passed to date_init) or we are in some day successive to the initial one, so that day_of_month has already be computed in previous step
        !>TBD: something to calculate the current year is missing
-       ELSEIF ( day_of_month .GT. 0 .AND. day_of_month .LE. 31 .AND. month_of_year .GT. 0 .AND. month_of_year .LE. 12) THEN
+       ELSEIF ( day_of_month > 0 .AND. day_of_month <= 31 .AND. month_of_year > 0 .AND. month_of_year <= 12) THEN
  
           !> calculate month_of_year. TBD: test the condition when day_of_year==31
@@ -401 +404 @@
              month_of_year = 1
         
-          ELSE IF (day_of_year .GT. 1 .AND. day_of_year .GT. SUM(days(1:month_of_year))) THEN
+          ELSE IF (day_of_year > 1 .AND. day_of_year > SUM(days(1:month_of_year))) THEN
 
              month_of_year = month_of_year + 1