Changeset 55 for trunk

Timestamp:

02/10/09 15:03:49 (15 years ago)

Author:

pinsard

Message:

parametrisation of SIMULS_IRCAAM/progfiltrage_....f (modulo dimension); add makefile

Location:

trunk/src

Files:

• SIMULS_IRCAAM/prepare_olr_filtre_simulation.m (modified) (3 diffs)
• SIMULS_IRCAAM/progfiltrage_10_30.f (modified) (1 diff)
• SIMULS_IRCAAM/progfiltrage_1_8.f (modified) (1 diff)
• SIMULS_IRCAAM/progfiltrage_30_100.f (modified) (1 diff)
• SIMULS_IRCAAM/progfiltrage_8_28.f (modified) (1 diff)
• SIMULS_IRCAAM/progfiltrage_simulation.f (copied) (copied from trunk/src/SIMULS_IRCAAM/progfiltrage_10_30.f) (2 diffs)
• forfilter.f (copied) (copied from trunk/src/SIMULS_IRCAAM/progfiltrage_10_30.f) (5 diffs)
• ircaam_profile.sh (modified) (5 diffs)
• makefile (added)

trunk/src/SIMULS_IRCAAM/prepare_olr_filtre_simulation.m

@@ -54 +54 @@
 % $Id$
 %
+% - fplod 2009-02-04T09:40:31Z aedon.locean-ipsl.upmc.fr (Darwin)
+%   * force output to be written using EEE floating point with little-endian byte 
+%     order
 % - fplod 2009-02-02T13:45:57Z aedon.locean-ipsl.upmc.fr (Darwin)
 %
@@ -69 +72 @@
 global IRCAAM_ID;
 global IRCAAM_OD;
+
+% force output to be written using EEE floating point with little-endian byte 
+% order
+machineformat='l' 
 
 if nargin==2
@@ -140 +147 @@
 
 fullfilename=[IRCAAM_OD,'olr_nofiltre_',ircaam_dataset,'_', simulation, '.dat'];
-fid=fopen(fullfilename,'w');
+fid=fopen(fullfilename,'w',machineformat);
 clear fullfilename;
 fwrite(fid,olr,'float');

trunk/src/SIMULS_IRCAAM/progfiltrage_10_30.f

@@ +1 @@
+c PROGRAM Filtrage
+C
+C+
+C
+C EVOLUTIONS
+C ===========
+C
+C $Id$
+C 
+C - fplod 2009-02-10T13:22:27Z aedon.locean-ipsl.upmc.fr (Darwin)
+C
+C   * replaced by progfiltrage_simulation.f
+C
+C-
 
-c PROGRAM Filtrage
 
 c   filtrage sur olr JAN-DEC de 1968

trunk/src/SIMULS_IRCAAM/progfiltrage_1_8.f

@@ -1 @@
-
 c PROGRAM Filtrage
+C
+C+
+C
+C EVOLUTIONS
+C ===========
+C
+C $Id$
+C
+C - fplod 2009-02-10T13:22:27Z aedon.locean-ipsl.upmc.fr (Darwin)
+C
+C   * replaced by progfiltrage_simulation.f modulo dimension
+C
+C-
 
 c   filtrage sur olr JAN-DEC de 1968

trunk/src/SIMULS_IRCAAM/progfiltrage_30_100.f

@@ -1 @@
-
 c PROGRAM Filtrage
+C
+C+
+C
+C EVOLUTIONS
+C ===========
+C
+C $Id$
+C
+C - fplod 2009-02-10T13:22:27Z aedon.locean-ipsl.upmc.fr (Darwin)
+C
+C   * replaced by progfiltrage_simulation.f modulo dimension
+C
+C-
 
 c   filtrage sur olr JAN-DEC de 1968

trunk/src/SIMULS_IRCAAM/progfiltrage_8_28.f

@@ -1 @@
-
 c PROGRAM Filtrage
+C
+C+
+C
+C EVOLUTIONS
+C ===========
+C
+C $Id$
+C
+C - fplod 2009-02-10T13:22:27Z aedon.locean-ipsl.upmc.fr (Darwin)
+C
+C   * replaced by progfiltrage_simulation.f modulo dimension
+C
+C-
 
 c   filtrage sur olr JAN-DEC de 1968

trunk/src/SIMULS_IRCAAM/progfiltrage_simulation.f

@@ -1 @@
-
-c PROGRAM Filtrage
-
-c   filtrage sur olr JAN-DEC de 1968
-
-      parameter (nb=3538.,period1=10.,period2=30.)
-
-       dimension olr(24,15,nb),vb(nb)
-       dimension vvb(nb),vvvb(nb),olrf(24,15,nb)
-
-      open(1,file='olr_ctl.dat' 
-     *,form='unformatted',access='direct',recl=nb*24*15*4)
-      read(1,rec=1) 
-     *(((olr(i,j,k),i=1,24),j=1,15),k=1,nb)
-      close(1)
+      PROGRAM progfiltrage_simulation
+C+
+C
+C NAME
+C ====
+C
+C ``progfiltrage_simulation.x``
+C
+C SYNOPSIS
+C ========
+C
+C ``progfiltrage_simulation.x``
+C
+C DESCRIPTION
+C ===========
+C
+C filtrage sur olr JAN-DEC de 1968
+C ++
+C
+C From olr_nofiltre_arpege_ \ *simulation*\ .dat.
+C ``progfiltrage_simulation.x`` compute ++.
+C
+C ``progfiltrage_simulation.x`` write
+C olr_filtre_\ *period1*\ -\ *period2*\ d_arpege_ \ *simulation*\ .dat.
+C
+C
+C CAUTIONS
+C ========
+C
+C On MAC ppc, this program must be compile with ``-fendian=little``
+C for g95
+C according to machineformat used in prepare_olr_filtre_simulation.m_.
+C
+C EXAMPLES
+C ========
+C
+C Following line read ``olr_nofiltre_arpege_AfNQIVIV.dat``,
+C compute ++,
+C write ``olr_filtre_10-30d_arpege_AfNQIVIV.dat``
+C ::
+C
+C $ echo "arpege AfNQIVIV 10 30" | progfiltrage_simulation.x -
+C
+C SEE ALSO
+C ========
+C
+C prepare_olr_filtre_simulation.m_
+C
+C .. _prepare_olr_filtre_simulation.m : prepare_olr_filtre_simulation.m.html
+C
+C forfilter.f_
+C
+C .. _forfilter.f : forfilter.f.html
+C
+C TODO
+C ====
+C
+C underflow tracking (see ifort failure)
+C
+C REAL ou DOUBLE PRECISION dans les fichiers matlab
+C
+C improve description
+C
+C improve file pb (err in open/read/write)
+C
+C F90 modules
+C
+C portability check because of getenv : now (20090203) written for
+C working on zeus using g95 (GCC 4.0.3 (g95!) Jun 18 2006)
+C
+C use PT fortran tool box ?! when public ...
+C
+C direct access file ? seems to work but see also
+C http://objectmix.com/fortran/305264-read-binaries-matlab.html
+C
+C EVOLUTIONS
+C ==========
+C
+C $Id$
+C
+C - fplod 2009-02-10T13:57:29Z aedon.locean-ipsl.upmc.fr (Darwin)
+C
+C   * bug fix on output file name to be compatible to convention
+C     (not fixed period number of digits)
+C
+C - fplod 2009-02-02T13:45:57Z aedon.locean-ipsl.upmc.fr (Darwin)
+C
+C   * created from progfiltrage_10_30.f  to replace it as well as
+C     progfiltrage_30_100.f
+C
+C   * Subroutines externalized in forfilter.f
+C
+C   * add parameters ircaam_dataset and simulation according to
+C     prepare_olr_filtre_simulation.m
+C
+C   * consolidation : implicit none, inquire iolength, force
+C     LITTLE ENDIAN
+C
+C-
+C
+      IMPLICIT NONE
+
+      EXTERNAL FILTRE
+
+      INTEGER, PARAMETER :: nb = 3660
+      INTEGER :: period1
+      INTEGER :: period2
+C
+      INTEGER :: i
+      INTEGER :: j
+      INTEGER :: k
+      INTEGER :: l
+      INTEGER :: lon0
+      INTEGER :: lat0
+C
+      REAL :: olr(24,15,nb),vb(nb)
+      REAL :: vvb(nb),vvvb(nb),olrf(24,15,nb)
+C
+      CHARACTER (LEN=255) :: ircaam_id
+      CHARACTER (LEN=255) :: ircaam_od
+C
+      CHARACTER (LEN=255) :: fullfilename
+      CHARACTER (LEN=255) :: fullfilename_format
+      INTEGER :: record_length = 0
+C
+      CHARACTER (LEN=6) :: ircaam_dataset
+      CHARACTER (LEN=8) :: simulation
+      LOGICAL           :: vsel = .TRUE.
+
+      write (*,*) 'enter ircaam_dataset simulation period1 period2'
+      read (*,*) ircaam_dataset,simulation,period1,period2
+
+      write (*,*) 'ircaam_dataset : ', ircaam_dataset
+      write (*,*) 'simulation : ', simulation
+      write (*,*) 'period1 : ', period1
+      write (*,*) 'period2 : ', period2
+
+C validation of ircaam_dataset
+      IF (ircaam_dataset /= 'arpege') THEN
+       vsel = .FALSE.
+       WRITE(*,*)' eee : pb validation ircaam_dataset'
+      ENDIF
+
+C validation of simulation
+      IF ((simulation /= 'AfNQIVIV') .AND.
+     +    (simulation /= 'TrNQIVIV') .AND.
+     +    (simulation /= 'AsNQIVIV') .AND.
+     +    (simulation /= 'CtIV') .AND.
+     +    (simulation /= 'CtCl ')) THEN
+       vsel = .FALSE.
+       WRITE(*,*)' eee : pb validation simulation'
+      ENDIF
+
+C validation of period1 and period2
+
+      IF (period1 >= period2) THEN
+       vsel = .FALSE.
+       WRITE(*,*)' eee : pb validation period1 vs period2'
+      ENDIF
+C
+      IF (.NOT. vsel) THEN
+       GOTO 994
+      ENDIF
+
+      CALL GETENV('IRCAAM_ID',ircaam_id)
+C++      ircaam_id='/usr/temp/fplod/ircaam_d/'
+      CALL GETENV('IRCAAM_OD',ircaam_od)
+C++      ircaam_od='/usr/temp/fplod/ircaam_d/'
+
+      WRITE(fullfilename,'(A,A,A,A,A,A)')
+     +TRIM(ircaam_id),
+     +'olr_nofiltre_',
+     +TRIM(ircaam_dataset),
+     +'_',
+     +TRIM(simulation),
+     +'.dat'
+
+C ask for record length
+      INQUIRE (IOLENGTH=record_length)
+     +(((olr(i,j,k),i=1,24),j=1,15),k=1,nb)
+
+      open(1,file=fullfilename
+     +,status='old'
+     +,form='unformatted',access='direct',recl=record_length)
+
+      read(1,rec=1)
+     +(((olr(i,j,k),i=1,24),j=1,15),k=1,nb)
+
+      CLOSE(1)
 
 c  l'ordre maximal du filtrage est tel que 2*MOR+1 < nb
@@ -19 +193 @@
 
       do lon0=1,24
-      do lat0=1,15
-      do i=1,nb
-      vb(i)=olr(lon0,lat0,i)
+       do lat0=1,15
+        do i=1,nb
+         vb(i)=olr(lon0,lat0,i)
+        enddo
+        call filtre(vb,vvb,REAL(period1),nb)
+        call filtre(vb,vvvb,REAL(period2),nb)
+        do i=1,nb
+         olrf(lon0,lat0,i)=vvb(i)-vvvb(i)
+        enddo
+       enddo
       enddo
-      call filtre(vb,vvb,period1,nb)
-      call filtre(vb,vvvb,period2,nb)
-      do i=1,nb
-      olrf(lon0,lat0,i)=vvb(i)-vvvb(i)
-      enddo
-      enddo
-      enddo
-c      print*,(olrf(1,1,j),j=1,nb)
-
-        open(2,file='olrf10-30_clim_sst.80.dat' 
-     *,form='unformatted',access='direct',recl=24*15*nb*4)
-        write(2,rec=1)(((olrf(lon0,lat0,l),lon0=1,24), 
-     *                lat0=1,15),l=1,nb)
+C      print*,(olrf(1,1,j),j=1,nb)
+
+C adjust format of output filename according to period1 and period2 values
+      fullfilename_format = '(A,A,'
+      IF (period1 < 10 ) THEN 
+       fullfilename_format = TRIM(fullfilename_format)//'I1,'
+      ENDIF
+      IF ((period1 >= 10) .AND. (period1 < 100)) THEN 
+       fullfilename_format = TRIM(fullfilename_format)//'I2,'
+      ENDIF
+      IF (period1 >= 100 ) THEN 
+       fullfilename_format = TRIM(fullfilename_format)//'I3,'
+      ENDIF
+      fullfilename_format = TRIM(fullfilename_format) //'A,'
+      IF (period2 < 10 ) THEN 
+       fullfilename_format = TRIM(fullfilename_format)//'I1,'
+      ENDIF
+      IF ((period2 >= 10) .AND. (period2 < 100)) THEN 
+       fullfilename_format = TRIM(fullfilename_format)//'I2,'
+      ENDIF
+      IF (period2 >= 100 ) THEN 
+       fullfilename_format = TRIM(fullfilename_format)//'I3,'
+      ENDIF
+
+      fullfilename_format = TRIM(fullfilename_format)//'A,A,A,A,A)'
+
+      WRITE(fullfilename,fullfilename_format)
+     +TRIM(ircaam_od),
+     +'olr_filtre_',
+     +period1,
+     +'-',
+     +period2,
+     +'d_',
+     +TRIM(ircaam_dataset),
+     +'_',
+     +TRIM(simulation),
+     +'.dat'
+
+      open(2,file=fullfilename
+     +,status='replace'
+     +,form='unformatted',access='direct',recl=24*15*nb*4)
+
+      write(2,rec=1)(((olrf(lon0,lat0,l),lon0=1,24),
+     +                lat0=1,15),l=1,nb)
       close(2)
 
-        END
-
-      SUBROUTINE FILTRE(F,F1,PERIO,N)
-      PARAMETER(KOR=4,JOR=4,MOR=50)
-      DIMENSION F(N),W(-MOR:mor),G(-MOR:mor),F1(N)
-      PI=ACOS(-1.)
-      FC=1./PERIO
-      CALL KISER(G,MOR)
-      DO 1 I=-MOR,MOR
-      IF (I.EQ.0) THEN
-      W(I)=2.*FC
-      ELSE
-      W(I)=SIN(2.*PI*FC*FLOAT(I))/(PI*FLOAT(I))*G(I)
-      ENDIF
-   1  CONTINUE
-
-      DO 2 I=1,N
-      F1(I)=0.
-      AT=0.
-
-      IF(I.LE.KOR) THEN
-      L1=-KOR
-      L2=I-1
-      ENDIF
-
-      IF((I.GE.KOR+1).AND.(I.LE.MOR)) THEN
-      L1=-I+1
-      L2=I-1
-      ENDIF
-
-      IF((I.GE.MOR+1).AND.(I.LE.N-MOR)) THEN
-      L1=-MOR
-      L2=MOR
-      ENDIF
-
-      IF((I.GE.N-MOR+1).AND.(I.LE.N-JOR)) THEN
-      L1=-N+I
-      L2=N-I
-      ENDIF
-
-      IF(I.GE.N-JOR+1) THEN
-      L1=-N+I
-      L2=JOR
-      ENDIF
-
-      DO 3 K=L1,L2
-      F1(I)=F1(I)+W(K)*F(I-K)
-      AT=AT+W(K)
-   3  CONTINUE
-      F1(I)=F1(I)/AT
-   2  CONTINUE
-
-      RETURN
+994   CONTINUE
+      STOP
       END
-
-      SUBROUTINE KISER(W,MOR)
-      PARAMETER(LOR=100)
-      DIMENSION W(-MOR:MOR),CO(-LOR:LOR)
-
-      A=30.
-
-      IF(A.LE.21.) THEN
-      ALPHA=0.
-      ENDIF
-
-      IF((A.LT.50.).AND.(A.GT.21.)) THEN
-      ALPHA=0.5842*(A-21.)**0.4+0.07886*(A-21.)
-      ENDIF
-
-      IF(A.GE.50.) THEN
-      ALPHA=0.1102*(A-8.7)
-      ENDIF
-
-      DO 2 I=-MOR,MOR
-      CO(I)=ALPHA*SQRT(1.-(FLOAT(I)/FLOAT(MOR))**2)
-
-      N=0
-      AS=1.
-      AU=1.
-      AS1=1.
-      AU1=1.
-
-      DO 10 K=1,200
-      N=N+1
-
-      AU=AU*((CO(I)/2.)/FLOAT(N))**2
-      AS=AS+AU
-
-      AU1=AU1*((ALPHA/2.)/FLOAT(N))**2
-      AS1=AS1+AU1
-  10  CONTINUE
-      W(I)=AS/AS1
-   2  CONTINUE
-      RETURN
-      END
-
-

trunk/src/forfilter.f

@@ +1 @@
+C
+C+
+C
+C NAME
+C ====
+C
+C forfilter
+C
+C DESCRIPTION
+C ===========
+C
+C filtre kiser ++
+C
+C EXAMPLES
+C ========
+C
+C SEE ALSO
+C ========
+C
+C progfiltrage_simulation.f_
+C
+C .. _progfiltrage_simulation.f : progfiltrage_simulation.f.html
+C
+C TODO
+C ====
+C
+C improve comments
+C
+C add IMPLICIT NONE
+C
+C find bibliographical reference
+C
+C f90 module
+C
+C 2 subroutines so 2 ReSt blocks and 2 files .rst
+C
+C EVOLUTIONS
+C ==========
+C
+C $Id$
+C
+C - fplod 2009-02-10T11:11:33Z aedon.locean-ipsl.upmc.fr (Darwin)
+C
+C   * replace FLOAT use by generic function REAL
+C
+C - fplod 2009-02-03T09:21:30Z aedon.locean-ipsl.upmc.fr (Darwin)
+C
+C    * creation form SIMUL_IRCAAM/progfiltrage_10_30.f
+C    * Comments in ReST
+C
+C-
+C
+      SUBROUTINE FILTRE(F,F1,PERIO,N)
 
-c PROGRAM Filtrage
+      IMPLICIT NONE
 
-c   filtrage sur olr JAN-DEC de 1968
+      INTEGER, PARAMETER :: KOR = 4
+      INTEGER, PARAMETER :: JOR = 4
+      INTEGER, PARAMETER :: MOR = 50
 
-      parameter (nb=3538.,period1=10.,period2=30.)
+      INTEGER, INTENT(IN) :: N
+      REAL, INTENT(IN), DIMENSION(N) :: F
+      REAL :: W(-mor:mor)
+      REAL :: G(-mor:mor)
+      REAL, INTENT(OUT) :: F1(N)
+      REAL, INTENT(IN) :: PERIO
 
-       dimension olr(24,15,nb),vb(nb)
-       dimension vvb(nb),vvvb(nb),olrf(24,15,nb)
+      INTEGER :: I
+      INTEGER :: K
+      INTEGER :: L1
+      INTEGER :: L2
 
-      open(1,file='olr_ctl.dat' 
-     *,form='unformatted',access='direct',recl=nb*24*15*4)
-      read(1,rec=1) 
-     *(((olr(i,j,k),i=1,24),j=1,15),k=1,nb)
-      close(1)
+      REAL :: FC
+      REAL :: AT
+      REAL :: PI
 
-c  l'ordre maximal du filtrage est tel que 2*MOR+1 < nb
-c  veuillez changer dans la subroutine FILTRE le parameter MOR
-
-      do lon0=1,24
-      do lat0=1,15
-      do i=1,nb
-      vb(i)=olr(lon0,lat0,i)
-      enddo
-      call filtre(vb,vvb,period1,nb)
-      call filtre(vb,vvvb,period2,nb)
-      do i=1,nb
-      olrf(lon0,lat0,i)=vvb(i)-vvvb(i)
-      enddo
-      enddo
-      enddo
-c      print*,(olrf(1,1,j),j=1,nb)
-
-        open(2,file='olrf10-30_clim_sst.80.dat' 
-     *,form='unformatted',access='direct',recl=24*15*nb*4)
-        write(2,rec=1)(((olrf(lon0,lat0,l),lon0=1,24), 
-     *                lat0=1,15),l=1,nb)
-      close(2)
-
-        END
-
-      SUBROUTINE FILTRE(F,F1,PERIO,N)
-      PARAMETER(KOR=4,JOR=4,MOR=50)
-      DIMENSION F(N),W(-MOR:mor),G(-MOR:mor),F1(N)
       PI=ACOS(-1.)
       FC=1./PERIO
@@ -50 +82 @@
       W(I)=2.*FC
       ELSE
-      W(I)=SIN(2.*PI*FC*FLOAT(I))/(PI*FLOAT(I))*G(I)
+      W(I)=SIN(2.*PI*FC*REAL(I))/(PI*REAL(I))*G(I)
       ENDIF
    1  CONTINUE
@@ -94 +126 @@
 
       SUBROUTINE KISER(W,MOR)
-      PARAMETER(LOR=100)
-      DIMENSION W(-MOR:MOR),CO(-LOR:LOR)
+C
+      IMPLICIT NONE
+
+      INTEGER, INTENT(IN) :: MOR
+      INTEGER, PARAMETER :: LOR = 100
+      REAL, INTENT(INOUT), DIMENSION(-MOR:MOR) :: W
+      REAL CO(-LOR:LOR)
+
+      REAL :: A
+      REAL :: AS
+      REAL :: AS1
+      REAL :: AU
+      REAL :: AU1
+      REAL :: ALPHA
+      INTEGER :: I
+      INTEGER :: K
+      INTEGER :: N
 
       A=30.
@@ -112 +159 @@
 
       DO 2 I=-MOR,MOR
-      CO(I)=ALPHA*SQRT(1.-(FLOAT(I)/FLOAT(MOR))**2)
+      CO(I)=ALPHA*SQRT(1.-(REAL(I)/REAL(MOR))**2)
 
       N=0
@@ -133 +180 @@
       RETURN
       END
-
-

trunk/src/ircaam_profile.sh

@@ -25 +25 @@
 # define IRCAAM environnement
 #
-# ${IRCAAM} is the base directory of tools.
+# ${IRCAAM} is the source base directory of tools.
 #
 # ${IRCAAM_LOG} is the directory where log files  will be written.
@@ -32 +32 @@
 #
 # ${IRCAAM_OD} is the directory where output files will be written.
+#
+# ${IRCAAM}/../bin/ is added to PATH.
 #
 # MANPATH++
@@ -46 +48 @@
 # EXAMPLES
 # ========
-#
 #
 # For fplod, on aedon.locean-ipsl.upmc.fr:
@@ -97 +98 @@
 #
 # $Id$
+#
+# - fplod 2009-02-04T13:35:30Z zeus.locean-ipsl.upmc.fr (Linux)
+#
+#  * ${IRCAAM}/../bin/ is added to PATH.
 #
 # - fplod 2008-08-14T12:28:16Z aedon.locean-ipsl.upmc.fr (Darwin)
@@ -203 +208 @@
 fi
 #
+# add ${IRCAAM}/../bin tools to PATH
+# if not already done
+echo ${PATH} | grep -q "${IRCAAM}/../bin"
+test_path=${?}
+if [ ${test_path} -ne 0 ]
+then
+   PATH=${IRCAAM}/../bin/:${PATH}
+   export PATH
+else
+   # option bavarde oui/non pas encore implantée ++
+   echo "${command} : iii : ${IRCAAM}/../bin/ already in \${PATH}"
+fi
+#
 IRCAAM_LOG=${tempdir}
 export IRCAAM_LOG