Changeset 714 for codes/icosagcm/devel/src/diagnostics/wind.F90

Timestamp:

08/03/18 16:53:37 (6 years ago)

Author:

dubos

Message:

devel : backported from trunk commits r607,r648,r649,r667,r668,r669,r706

File:

• codes/icosagcm/devel/src/diagnostics/wind.F90 (modified) (4 diffs)

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

@@ -12 +12 @@
 CONTAINS
 
-  SUBROUTINE un2ulonlat(f_u, f_ulon, f_ulat)
+  SUBROUTINE un2ulonlat(f_u, f_ulon, f_ulat, scale_)
     TYPE(t_field), POINTER :: f_u(:) ! IN  : normal velocity components on edges
     TYPE(t_field), POINTER :: f_ulon(:), f_ulat(:) ! OUT : velocity reconstructed at hexagons    
-    REAL(rstd),POINTER :: u(:,:),  ulon(:,:), ulat(:,:)
+    REAL(rstd),POINTER     :: u(:,:),  ulon(:,:), ulat(:,:)
+    REAL(rstd), OPTIONAL   :: scale_ 
+    REAL(rstd)             :: scale
     INTEGER :: ind
-
+    scale = MERGE(scale_, 1., PRESENT(scale_))
     DO ind=1,ndomain
        IF (.NOT. assigned_domain(ind)) CYCLE
@@ -25 +27 @@
        ulon=f_ulon(ind)
        ulat=f_ulat(ind)
-       CALL compute_un2ulonlat(u,ulon, ulat)
+       CALL compute_un2ulonlat(u,ulon, ulat, scale)
     END DO
 
@@ -49 +51 @@
   END SUBROUTINE ulonlat2un
  
-  SUBROUTINE compute_wind_centered(ue,ucenter)
+  SUBROUTINE compute_wind_centered(ue,ucenter,scale_)
   REAL(rstd) :: ue(3*iim*jjm,llm)
   REAL(rstd) :: ucenter(iim*jjm,llm,3)
+  REAL(rstd), INTENT(IN), OPTIONAL :: scale_
   INTEGER :: ij,l
-  REAL(rstd), PARAMETER :: scale=1.
-  REAL(rstd) :: fac, ue_le, cx,cy,cz, ux,uy,uz
+  REAL(rstd) :: scale,fac, ue_le, cx,cy,cz, ux,uy,uz
+  scale = MERGE(scale_, 1., PRESENT(scale_))
 #include "../kernels_hex/wind_centered.k90"
  END SUBROUTINE compute_wind_centered
@@ -328 +331 @@
 
 
- SUBROUTINE compute_un2ulonlat(un, ulon, ulat)
+ SUBROUTINE compute_un2ulonlat(un, ulon, ulat, scale)
   REAL(rstd),INTENT(IN)  :: un(3*iim*jjm,llm)
   REAL(rstd),INTENT(OUT) :: ulon(iim*jjm,llm)
   REAL(rstd),INTENT(OUT) :: ulat(iim*jjm,llm)
-
   REAL(rstd)             :: uc(iim*jjm,llm,3)
-    
-  CALL compute_wind_centered(un,uc)  
+  REAL(rstd)             :: scale
+  CALL compute_wind_centered(un,uc,scale)
   CALL compute_wind_centered_lonlat_compound(uc, ulon, ulat)