Changeset 2675 in lmdz_wrf for trunk/tools/module_scientific.f90

Timestamp:

Jul 12, 2019, 10:31:58 PM (5 years ago)

Author:

lfita

Message:

Adding:

• 'frontogenesis': Calculation of the frontogenesis diagnostics

File:

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

trunk/tools/module_scientific.f90

@@ -7923 +7923 @@
   END FUNCTION vecmodule3D
 
-  SUBROUTINE FUNCTION matmodule3D(d1, d2, d3, mat, matmodule)
+  SUBROUTINE matmodule3D(d1, d2, d3, mat, matmodule)
   ! Subroutine to compute the module of a 3D matrix with 3 components
 
     IMPLICIT NONE
 
+    INTEGER, INTENT(in)                                  :: d1,d2,d3
     REAL(r_k), DIMENSION(d1,d2,d3,3), INTENT(in)         :: mat
     REAL(r_k), DIMENSION(d1,d2,d3), INTENT(out)          :: matmodule
@@ -7933 +7934 @@
     fname = 'matmodule3D'
 
-    matmodule3D = SQRT(vec(:,:,:,1)*vec(:,:,:,1) + vec(:,:,:,2)*vec(:,:,:,2) +                        &
-      vec(:,:,:,3)*vec(:,:,:,3))
+    matmodule = SQRT(mat(:,:,:,1)*mat(:,:,:,1) + mat(:,:,:,2)*mat(:,:,:,2) + mat(:,:,:,3)*mat(:,:,:,3))
 
   END SUBROUTINE matmodule3D
@@ -7960 +7960 @@
     def = fillval64
 
-    def(:,:,:,1) = - uagrad(:,:,:,1)*vargrad(:,:,:1) - vagrad(:,:,:,1)*vargrad(:,:,:2)
-    def(:,:,:,2) = - uagrad(:,:,:,2)*vargrad(:,:,:1) - vagrad(:,:,:,2)*vargrad(:,:,:2)
-    def(:,:,:,3) = - uagrad(:,:,:,3)*vargrad(:,:,:1) - vagrad(:,:,:,3)*vargrad(:,:,:2)
+    def(:,:,:,1) = -uagrad(:,:,:,1)*vargrad(:,:,:,1) -vagrad(:,:,:,1)*vargrad(:,:,:,2)
+    def(:,:,:,2) = -uagrad(:,:,:,2)*vargrad(:,:,:,1) -vagrad(:,:,:,2)*vargrad(:,:,:,2)
+    def(:,:,:,3) = -uagrad(:,:,:,3)*vargrad(:,:,:,1) -vagrad(:,:,:,3)*vargrad(:,:,:,2)
 
   END SUBROUTINE deformation3D
@@ -7988 +7988 @@
     tilt = fillval64
 
-    tilt(:,:,:,1) = - uagrad(:,:,:,1)*vargrad(:,:,:3)
-    tilt(:,:,:,2) = - vagrad(:,:,:,2)*vargrad(:,:,:3)
-    tilt(:,:,:,3) = - wagrad(:,:,:,3)*vargrad(:,:,:3)
+    tilt(:,:,:,1) = -wagrad(:,:,:,1)*vargrad(:,:,:,3)
+    tilt(:,:,:,2) = -wagrad(:,:,:,2)*vargrad(:,:,:,3)
+    tilt(:,:,:,3) = -wagrad(:,:,:,3)*vargrad(:,:,:,3)
 
   END SUBROUTINE tilting3D
@@ -8000 +8000 @@
 
     INTEGER, INTENT(in)                                  :: dx, dy, dz, dt
-    REAL(r_k), DIMENSION(dx,dy,dz,dt), INTENT(in)        :: vargrad
+    REAL(r_k), INTENT(in)                                :: ddt
+    REAL(r_k), DIMENSION(dx,dy,dz,dt), INTENT(in)        :: var
     CHARACTER(LEN=*), INTENT(in)                         :: dtkind
     REAL(r_k), DIMENSION(dx,dy,dz,dt), INTENT(out)       :: vardt
@@ -8039 +8040 @@
     END IF    
 
-  END SUBROUTINE tilting3D
+  END SUBROUTINE deltat3D
 
 END MODULE module_scientific