[cdftools] 121/228: JMM : fix conflicts in cdffindij and cdftools for coordinate file name
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jun 12 08:21:38 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository cdftools.
commit 8088ce9ec59edd31d7c812d537044bf75be78810
Author: molines <molines at 1055176f-818a-41d9-83e1-73fbe5b947c5>
Date: Thu Dec 29 14:26:22 2011 +0000
JMM : fix conflicts in cdffindij and cdftools for coordinate file name
git-svn-id: http://servforge.legi.grenoble-inp.fr/svn/CDFTOOLS/trunk@569 1055176f-818a-41d9-83e1-73fbe5b947c5
---
Macrolib/macro.jade | 2 ++
cdffindij.f90 | 12 +++++++-----
cdftools.f90 | 41 +++++++++++++++++++++--------------------
3 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/Macrolib/macro.jade b/Macrolib/macro.jade
index f4c9173..335ac89 100644
--- a/Macrolib/macro.jade
+++ b/Macrolib/macro.jade
@@ -9,6 +9,8 @@ NCDF= -I/opt/software/SGI/netcdf/4.0/include -L/opt/software/SGI/netcdf/4.0/lib
F90=ifort
MPF90=mpif90
# flag static is used to allow the use of CDFTOOLS in parallel with mpi_metamon
+#FFLAGS= -O $(NCDF) -assume byterecl -convert big_endian -CB -fpe0 -g -traceback -ftrapuv
+
FFLAGS= -static -O $(NCDF) -assume byterecl -convert big_endian
#FFLAGS= -static -O $(NCDF) -assume byterecl -convert big_endian -g -traceback -fpe0 -ftrapuv -CB
LMPI=-lmpich
diff --git a/cdffindij.f90 b/cdffindij.f90
index 5595d7b..0524b89 100644
--- a/cdffindij.f90
+++ b/cdffindij.f90
@@ -32,10 +32,12 @@ PROGRAM cdffindij
REAL(KIND=4) :: xmin, xmax, ymin, ymax ! geographical window
- CHARACTER(LEN=256) :: ctype='F' ! point type to search for
+ CHARACTER(LEN=256) :: cltype='F' ! point type to search for
CHARACTER(LEN=256) :: cldum ! dummy character variable
+ CHARACTER(LEN=256) :: clcoo ! dummy character variable
!!----------------------------------------------------------------------
CALL ReadCdfNames()
+ clcoo = cn_fcoo
!! Read command line and output usage message if not compliant.
narg= iargc()
@@ -53,7 +55,7 @@ PROGRAM cdffindij
PRINT *,' [-c COOR-file ] : specify a particular coordinate file'
PRINT *,' default is ',TRIM(cn_fcoo)
PRINT *,' [-p point type] : specify the point on the C-grid (T U V F)'
- PRINT *,' default is ',TRIM(ctype)
+ PRINT *,' default is ',TRIM(cltype)
PRINT *,' '
PRINT *,' REQUIRED FILES :'
PRINT *,' ', TRIM(cn_fcoo),' or the specified coordinates file.'
@@ -67,8 +69,8 @@ PROGRAM cdffindij
DO WHILE ( ijarg <= narg )
CALL getarg(ijarg, cldum ) ; ijarg=ijarg+1
SELECT CASE ( cldum )
- CASE ( '-c' ) ; CALL getarg(ijarg, cn_fcoo ) ; ijarg=ijarg+1
- CASE ( '-p' ) ; CALL getarg(ijarg, ctype ) ; ijarg=ijarg+1
+ CASE ( '-c' ) ; CALL getarg(ijarg, clcoo ) ; ijarg=ijarg+1
+ CASE ( '-p' ) ; CALL getarg(ijarg, cltype ) ; ijarg=ijarg+1
CASE DEFAULT
ireq=ireq+1
SELECT CASE (ireq)
@@ -82,6 +84,6 @@ PROGRAM cdffindij
END SELECT
END DO
- CALL cdf_findij ( xmin, xmax, ymin, ymax, iimin, iimax, ijmin, ijmax, cd_coord=cn_fcoo, cd_point=ctype)
+ CALL cdf_findij ( xmin, xmax, ymin, ymax, iimin, iimax, ijmin, ijmax, cd_coord=clcoo, cd_point=cltype)
END PROGRAM cdffindij
diff --git a/cdftools.f90 b/cdftools.f90
index 63f5d6a..2ed372f 100644
--- a/cdftools.f90
+++ b/cdftools.f90
@@ -60,6 +60,7 @@ CONTAINS
REAL(KIND=4) :: zglamfound, zglamin, zglamax
CHARACTER(LEN=256) :: cl_type='F'
+ CHARACTER(LEN=256) :: clcoo
LOGICAL :: ll_again, ll_bnd
!!--------------------------------------------------------------------------
@@ -70,38 +71,38 @@ CONTAINS
dl_ymin = pymin
dl_ymax = pymax
- IF ( PRESENT( cd_coord) ) cn_fcoo=cd_coord
+ IF ( PRESENT( cd_coord) ) clcoo=cd_coord
IF ( PRESENT( cd_point) ) cl_type=cd_point
- IF (chkfile (cn_fcoo) ) STOP ! missing file
+ IF (chkfile (clcoo) ) STOP ! missing file
- ipiglo= getdim (cn_fcoo,cn_x)
- ipjglo= getdim (cn_fcoo,cn_y)
+ ipiglo= getdim (clcoo, cn_x)
+ ipjglo= getdim (clcoo, cn_y)
ALLOCATE (dl_glam(ipiglo,ipjglo), dl_gphi(ipiglo,ipjglo) )
ALLOCATE (dl_e1 (ipiglo,ipjglo), dl_e2 (ipiglo,ipjglo) )
SELECT CASE ( cl_type )
CASE ('T' , 't' )
- dl_glam(:,:) = getvar(cn_fcoo, cn_glamt, 1, ipiglo, ipjglo)
- dl_gphi(:,:) = getvar(cn_fcoo, cn_gphit, 1, ipiglo, ipjglo)
- dl_e1 (:,:) = getvar(cn_fcoo, cn_ve1t, 1, ipiglo, ipjglo)
- dl_e2 (:,:) = getvar(cn_fcoo, cn_ve2t, 1, ipiglo, ipjglo)
+ dl_glam(:,:) = getvar(clcoo, cn_glamt, 1, ipiglo, ipjglo)
+ dl_gphi(:,:) = getvar(clcoo, cn_gphit, 1, ipiglo, ipjglo)
+ dl_e1 (:,:) = getvar(clcoo, cn_ve1t, 1, ipiglo, ipjglo)
+ dl_e2 (:,:) = getvar(clcoo, cn_ve2t, 1, ipiglo, ipjglo)
CASE ('U','u' )
- dl_glam(:,:) = getvar(cn_fcoo, cn_glamu, 1, ipiglo, ipjglo)
- dl_gphi(:,:) = getvar(cn_fcoo, cn_gphiu, 1, ipiglo, ipjglo)
- dl_e1 (:,:) = getvar(cn_fcoo, cn_ve1u, 1, ipiglo, ipjglo)
- dl_e2 (:,:) = getvar(cn_fcoo, cn_ve2u, 1, ipiglo, ipjglo)
+ dl_glam(:,:) = getvar(clcoo, cn_glamu, 1, ipiglo, ipjglo)
+ dl_gphi(:,:) = getvar(clcoo, cn_gphiu, 1, ipiglo, ipjglo)
+ dl_e1 (:,:) = getvar(clcoo, cn_ve1u, 1, ipiglo, ipjglo)
+ dl_e2 (:,:) = getvar(clcoo, cn_ve2u, 1, ipiglo, ipjglo)
CASE ('V','v' )
- dl_glam(:,:) = getvar(cn_fcoo, cn_glamv, 1, ipiglo, ipjglo)
- dl_gphi(:,:) = getvar(cn_fcoo, cn_gphiv, 1, ipiglo, ipjglo)
- dl_e1 (:,:) = getvar(cn_fcoo, cn_ve1v, 1, ipiglo, ipjglo)
- dl_e2 (:,:) = getvar(cn_fcoo, cn_ve2v, 1, ipiglo, ipjglo)
+ dl_glam(:,:) = getvar(clcoo, cn_glamv, 1, ipiglo, ipjglo)
+ dl_gphi(:,:) = getvar(clcoo, cn_gphiv, 1, ipiglo, ipjglo)
+ dl_e1 (:,:) = getvar(clcoo, cn_ve1v, 1, ipiglo, ipjglo)
+ dl_e2 (:,:) = getvar(clcoo, cn_ve2v, 1, ipiglo, ipjglo)
CASE ('F','f' )
- dl_glam(:,:) = getvar(cn_fcoo, cn_glamf, 1, ipiglo, ipjglo)
- dl_gphi(:,:) = getvar(cn_fcoo, cn_gphif, 1, ipiglo, ipjglo)
- dl_e1 (:,:) = getvar(cn_fcoo, cn_ve1f, 1, ipiglo, ipjglo)
- dl_e2 (:,:) = getvar(cn_fcoo, cn_ve2f, 1, ipiglo, ipjglo)
+ dl_glam(:,:) = getvar(clcoo, cn_glamf, 1, ipiglo, ipjglo)
+ dl_gphi(:,:) = getvar(clcoo, cn_gphif, 1, ipiglo, ipjglo)
+ dl_e1 (:,:) = getvar(clcoo, cn_ve1f, 1, ipiglo, ipjglo)
+ dl_e2 (:,:) = getvar(clcoo, cn_ve2f, 1, ipiglo, ipjglo)
CASE DEFAULT
PRINT *,' ERROR : type of point not known: ', TRIM(cl_type)
END SELECT
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdftools.git
More information about the debian-science-commits
mailing list