Changeset 2357 in lmdz_wrf

Timestamp:

Feb 20, 2019, 4:24:32 PM (6 years ago)

Author:

lfita

Message:

Adding:

• `from_coordlist_2DRKmatrix': Subroutine to construct a 2D RK matrix from a list of values accompaigned by a list of coordinates to find i,j grid-point coordinates by minimum distance
• `from_ptlist_2DRKNmatrix': Subroutine to construct N 2D RK matrix from a list of values accompaigned by a list of grid-point coordinates
• compilation of `module_ForGen.so' for 'llamp'

Location:

trunk/tools

Files:

• Makefile.llamp (modified) (6 diffs)
• module_generic.f90 (modified) (3 diffs)

trunk/tools/Makefile.llamp

@@ -54 +54 @@
 intsrcs = $(srcs) module_ForInterpolate.f90
 scisrcs = $(srcs)
+gensrcs = module_definitions.f90 module_basic.f90 module_generic.f90
 defsrcs = module_definitions.f90
 
@@ -62 +63 @@
         module_basic.o \
         module_generic.o \
+        module_NCgeneric.o \
         module_scientific.o \
         module_ForInterpolate.o \
@@ -91 +93 @@
         pyintmods.o \
         pyscimods.o \
+        pygenmods.o \
         pydefmods.o \
         trajectories_overlap.o
@@ -100 +103 @@
         pyintmods.o \
         pyscimods.o \
+        pygenmods.o \
         pydefmods.o
 
@@ -115 +119 @@
 
 clean :
-        $(RM) *.mod *.o interpolate module_ForDiag.so module_ForInt.so module_ForDistriCorrect.so module_ForSci.so module_ForDef.so
+        $(RM) *.mod *.o interpolate module_ForDiag.so module_ForInt.so module_ForDistriCorrect.so module_ForSci.so module_ForGen.so module_ForDef.so
 
 ########    #######
@@ -169 +173 @@
         $(F2PY) -c $(F2PYF) -I$(NCINCFOLD) -m module_ForSci $(scisrcs) -L$(NCLIBFOLD)
 
+pygenmods.o:
+        $(F2PY) -c $(F2PYF) -I$(NCINCFOLD) -m module_ForGen $(gensrcs) -L$(NCLIBFOLD)
+
 pydefmods.o:
         $(F2PY) -c $(F2PYF) -I$(NCINCFOLD) -m module_ForDef $(defsrcs) -L$(NCLIBFOLD)

trunk/tools/module_generic.f90

@@ -5 +5 @@
 ! continguos_homogene_zones: Subroutine to look for contiguous zones by looking by continuous grid points
 ! freeunit: provides the number of a free unit in which open a file
+! from_coordlist_2DRKmatrix: Subroutine to construct a 2D RK matrix from a list of values accompaigned 
+!   by a list of coordinates to find i,j grid-point coordinates by minimum distance
 ! from_ptlist_2DRKmatrix: Subroutine to construct a 2D RK matrix from a list of values accompaigned 
-!   by a list of coordinates
+!   by a list of grid-point coordinates
+! from_ptlist_2DRKNmatrix: Subroutine to construct N 2D RK matrix from a list of values accompaigned 
+!   by a list of grid-point coordinates
 ! GetInNamelist: Subroutine to get a paramter from a namelistfile
 ! get_xyconlimits: Subroutine for getting the limits of contiguous values from a given point in a 2D matrix
@@ -988 +992 @@
 
   SUBROUTINE from_ptlist_2DRKmatrix(Npts, pts, vals, dx, dy, NOval, matrix)
-  ! Subroutine to construct a 2D RK matrix from a list of values accompaigned by a list of coordinates
+  ! Subroutine to construct a 2D RK matrix from a list of values accompaigned by a list of grid-point 
+  !   coordinates
 
     IMPLICIT NONE
@@ -1023 +1028 @@
   END SUBROUTINE from_ptlist_2DRKmatrix
 
+  SUBROUTINE from_ptlist_2DRKNmatrix(Npts, pts, Nvals, vals, dx, dy, NOval, Nmatrix)
+  ! Subroutine to construct N 2D RK matrix from a list of values accompaigned by a list of grid-point 
+  !   coordinates
+
+    IMPLICIT NONE
+
+    INTEGER, INTENT(in)                                  :: Npts, dx, dy, Nvals
+    REAL(r_k), INTENT(in)                                :: NOval
+    INTEGER, DIMENSION(Npts,2), INTENT(in)               :: pts
+    REAL(r_k), DIMENSION(Npts,Nvals), INTENT(in)         :: vals
+    REAL(r_k), DIMENSION(dx,dy,Nvals), INTENT(out)       :: Nmatrix
+
+! Local
+    INTEGER                                              :: iv, i, j, ic
+
+!!!!!!! Variables
+! Npts: Number of values of the list
+! pts: 2D matrix coordinates of the values
+! Nvals: number of different values
+! vals: list of N-values correspondant to the coordinates
+! dx, dy: shape of the 2D matrix
+! NOval: Value to assign when there is no coordinate
+! Nmatrix: resultant N-matrix
+
+    fname = 'from_ptlist_2DRKNmatrix'
+
+    Nmatrix = NOval
+
+    DO iv=1, Npts
+      i = pts(iv,1)
+      j = pts(iv,2)
+      Nmatrix(i,j,:) = vals(iv,:)
+    END DO
+
+    RETURN
+
+  END SUBROUTINE from_ptlist_2DRKNmatrix
+
+  SUBROUTINE from_coordlist_2DRKmatrix(Npts, coords, xcoord, ycoord, vals, dx, dy, NOval, matrix)
+  ! Subroutine to construct a 2D RK matrix from a list of values accompaigned by a list of coordinates
+  !   to find i,j grid-point coordinates by minimum distance
+
+    IMPLICIT NONE
+
+    INTEGER, INTENT(in)                                  :: Npts, dx, dy
+    REAL(r_k), INTENT(in)                                :: NOval
+    REAL(r_k), DIMENSION(Npts,2), INTENT(in)             :: coords
+    REAL(r_k), DIMENSION(Npts), INTENT(in)               :: vals
+    REAL(r_k), DIMENSION(dx,dy), INTENT(in)              :: xcoord, ycoord
+    REAL(r_k), DIMENSION(dx,dy), INTENT(out)             :: matrix
+
+! Local
+    INTEGER                                              :: iv, i, j
+    REAL(r_k)                                            :: xi, yi
+    REAL(r_k), DIMENSION(dx,dy)                          :: diff
+    INTEGER, DIMENSION(2)                                :: minpt
+
+!!!!!!! Variables
+! Npts: Number of values of the list
+! coords: 2D coordinates of the values
+! vals: list of values correspondant to the coordinates
+! xcoord, ycoord: matrix of values correspondant to the each coordinate
+! dx, dy: shape of the 2D matrix
+! NOval: Value to assign when there is no coordinate
+! matrix: resultant matrix
+
+    fname = 'from_coordlist_2DRKmatrix'
+
+    matrix = NOval
+
+    DO iv=1, Npts
+      xi = coords(iv,1)
+      yi = coords(iv,2)
+      diff = SQRT((xcoord-xi)**2+(ycoord-yi)**2)
+      minpt = MINLOC(diff)
+      matrix(minpt(1),minpt(2)) = vals(iv)
+    END DO
+
+    RETURN
+
+  END SUBROUTINE from_coordlist_2DRKmatrix
+
 END MODULE module_generic