Changeset 897

Timestamp:

06/13/19 16:45:40 (5 years ago)

Author:

adurocher

Message:

trunk : Removed dereferencing of optional parameter (PGI OpenPower?)

File:

• codes/icosagcm/trunk/src/diagnostics/wind.F90 (modified) (2 diffs)

codes/icosagcm/trunk/src/diagnostics/wind.F90

@@ -19 +19 @@
     REAL(rstd)             :: scale
     INTEGER :: ind
-    scale = MERGE(scale_, 1., PRESENT(scale_))
+    scale=1.
+    IF(present(scale_)) scale=scale_
     DO ind=1,ndomain
        IF (.NOT. assigned_domain(ind)) CYCLE
@@ -57 +58 @@
   INTEGER :: ij,l
   REAL(rstd) :: scale,fac, ue_le, cx,cy,cz, ux,uy,uz
-  scale = MERGE(scale_, 1., PRESENT(scale_))
+  scale=1.
+  IF(present(scale_)) scale=scale_
 #include "../kernels/wind_centered.k90"
  END SUBROUTINE compute_wind_centered