Changeset 2667 in lmdz_wrf

Timestamp:

Jul 12, 2019, 5:40:33 PM (5 years ago)

Author:

lfita

Message:

Adjuting names of operatiors

File:

• trunk/tools/module_scientific.f90 (modified) (9 diffs)

trunk/tools/module_scientific.f90

@@ -106 +106 @@
 ! curl2D_1o: Subroutine to compute the first order curl of a 2D vectorial field
 ! curl2D_c1o: Subroutine to compute the first order centered curl of a 2D vectorial field
-! deformation3D_1o: Subroutine to compute the first order deformation of a 3D field
+! deformation3D: Subroutine to compute the deformation of a 3D field
 ! divergence2D_1o: Subroutine to compute the first order divergence of a 2D vectorial field
 ! divergence2D_c1o: Subroutine to compute the first order centered divergence of a 2D vectorial field
@@ -115 +115 @@
 ! lap2D_c1o: Subroutine to compute the first order centered laplacian of a 2D vectorial field
 ! matmodule3D: Subroutine to compute the module of a 3D matrix with 3 components
-! tilting3D_1o: Subroutine to compute the first order tilting of a 3D field
+! tilting3D: Subroutine to compute the tilting of a 3D field
 ! vecmodule3D: Function to compute the module of a 3D vector
 
@@ -7655 +7655 @@
 
     INTEGER, INTENT(in)                                  :: dx, dy, dz
-    REAL(r_k), DIMENSION(dx,dy,dz), INTENT(in)           :: var, dsz
+    REAL(r_k), DIMENSION(dx,dy,dz), INTENT(in)           :: var
     REAL(r_k), DIMENSION(dx,dy), INTENT(in)              :: dsx, dsy
+    REAL(r_k), DIMENSION(dz), INTENT(in)                 :: dsz
     REAL(r_k), DIMENSION(dx,dy,dz,3), INTENT(out)        :: grad
 
@@ -7676 +7677 @@
         DO k=1, dz-1
           grad(i,j,k,:) = (/ (var(i+1,j,k)-var(i,j,k))/dsx(i,j), (var(i,j+1,k)-var(i,j,k))/dsy(i,j),  &
-             (var(i,j,k+1)-var(i,j,k))/dsz(i,j,k) /)
+             (var(i,j,k+1)-var(i,j,k))/dsz(k) /)
         END DO
       END DO
@@ -7936 +7937 @@
   END SUBROUTINE matmodule3D
 
-  SUBROUTINE deformation3D_1o(dx, dy, dz, vargrad, uagrad, vagrad, def)
-  ! Subroutine to compute the first order deformation of a 3D field
-  !   FROM: From: https://en.wikipedia.org/wiki/Finite_difference_coefficient
+  SUBROUTINE deformation3D(dx, dy, dz, vargrad, uagrad, vagrad, def)
+  ! Subroutine to compute the deformation of a 3D field
 
     IMPLICIT NONE
@@ -7955 +7955 @@
 ! def: deformation
 
-    fname = 'deformation3D_1o'
+    fname = 'deformation3D'
 
     def = fillval64
@@ -7963 +7963 @@
     def(:,:,:,3) = - uagrad(:,:,:,3)*vargrad(:,:,:1) - vagrad(:,:,:,3)*vargrad(:,:,:2)
 
-  END SUBROUTINE deformation3D_1o
-
-  SUBROUTINE tilting3D_1o(dx, dy, dz, vargrad, wagrad, tilt)
-  ! Subroutine to compute the first order tilting of a 3D field
+  END SUBROUTINE deformation3D
+
+  SUBROUTINE tilting3D(dx, dy, dz, vargrad, wagrad, tilt)
+  ! Subroutine to compute the tilting of a 3D field
   !   FROM: From: https://en.wikipedia.org/wiki/Finite_difference_coefficient
 
@@ -7984 +7984 @@
 ! tilt: tilting
 
-    fname = 'tilting3D_1o'
+    fname = 'tilting3D'
 
     tilt = fillval64
@@ -7992 +7992 @@
     tilt(:,:,:,3) = - wagrad(:,:,:,3)*vargrad(:,:,:3)
 
-  END SUBROUTINE tilting3D_1o
+  END SUBROUTINE tilting3D
 
 END MODULE module_scientific