Changeset 1717 for LMDZ4/branches/LMDZ4_AR5

Timestamp:

Jan 25, 2013, 9:26:03 AM (12 years ago)

Author:

Ehouarn Millour

Message:

Added "arch" files for Ada (using dynamic libraries for NetCDF, you must have
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/smplocal/pub/NetCDF/4.1.3/lib:/smplocal/pub/HDF5/1.8.9/seq/lib
in your .bashrc or .bash_login or in your job to run).
Also updated some sources so that gcm bench runs in "debug" mode (note that all these changes are minor and have already been implemented in LMDZ5 trunk).
EM

Location:

LMDZ4/branches/LMDZ4_AR5

Files:

• arch/arch-X64_ADA.fcm (added)
• arch/arch-X64_ADA.path (added)
• libf/bibio/lnblnk.F (modified) (1 diff)
• libf/dyn3d/leapfrog.F (modified) (3 diffs)
• libf/dyn3dpar/leapfrog_p.F (modified) (3 diffs)
• libf/dyn3dpar/parallel.F90 (modified) (1 diff)
• libf/phylmd/physiq.F (modified) (3 diffs)
• libf/phylmd/printflag.F (modified) (1 diff)

LMDZ4/branches/LMDZ4_AR5/libf/bibio/lnblnk.F

@@ -23 +23 @@
 
       IMPLICIT NONE
-      INTEGER i,imax
-      PARAMETER (imax = 256)
-      CHARACTER*256 letter
+!      INTEGER i,imax
+!      PARAMETER (imax = 256)
+!      CHARACTER*256 letter
+      CHARACTER(len=*) :: letter
+!      i=0
 
-      i=0
+!10    i=i+1
+!      IF (letter(i:i+3) . EQ . '   ') GOTO 20
+!      GOTO 10
 
-10    i=i+1
-      IF (letter(i:i+3) . EQ . '   ') GOTO 20
-      GOTO 10
+!20    lnblnk=i-1
 
-20    lnblnk=i-1
+      lnblnk=len_trim(letter)
 
       RETURN

LMDZ4/branches/LMDZ4_AR5/libf/dyn3d/leapfrog.F

@@ -72 +72 @@
 
       real zqmin,zqmax
-      INTEGER nbetatmoy, nbetatdem,nbetat
+!      INTEGER nbetatmoy, nbetatdem,nbetat
 
 c   variables dynamiques
@@ -575 +575 @@
 c           IF( MOD(itau,iecri*day_step).EQ.0) THEN
 
-              nbetat = nbetatdem
+!              nbetat = nbetatdem
               CALL geopot(ip1jmp1,teta,pk,pks,phis,phi)
               unat=0.
@@ -682 +682 @@
               IF(MOD(itau,iecri         ).EQ.0) THEN
 c              IF(MOD(itau,iecri*day_step).EQ.0) THEN
-                nbetat = nbetatdem
+!                nbetat = nbetatdem
                 CALL geopot(ip1jmp1,teta,pk,pks,phis,phi)
                 unat=0.

LMDZ4/branches/LMDZ4_AR5/libf/dyn3dpar/leapfrog_p.F

@@ -75 +75 @@
 
       real zqmin,zqmax
-      INTEGER nbetatmoy, nbetatdem,nbetat
+!      INTEGER nbetatmoy, nbetatdem,nbetat
 
 c   variables dynamiques
@@ -1348 +1348 @@
 c$OMP BARRIER
 c$OMP MASTER
-              nbetat = nbetatdem
+!              nbetat = nbetatdem
               CALL geopot_p(ip1jmp1,teta,pk,pks,phis,phi)
        
@@ -1510 +1510 @@
 c$OMP BARRIER
 c$OMP MASTER
-                nbetat = nbetatdem
+!                nbetat = nbetatdem
                 CALL geopot_p(ip1jmp1,teta,pk,pks,phis,phi)
 

LMDZ4/branches/LMDZ4_AR5/libf/dyn3dpar/parallel.F90

@@ -476 +476 @@
           enddo
           
-        endif
+        else
+          ! Ehouarn: When in debug mode, ifort complains (for call MPI_GATHERV
+          !          below) about Buffer_Recv() being not allocated.
+          !          So make a dummy allocation.
+          allocate(Buffer_Recv(1))
+        endif ! of if (MPI_Rank==rank)
   
 !$OMP CRITICAL (MPI)

LMDZ4/branches/LMDZ4_AR5/libf/phylmd/physiq.F

@@ -1186 +1186 @@
       REAL, dimension(klon, klev) :: cldtaurad  ! epaisseur optique pour radlwsw,COSP
       REAL, dimension(klon, klev) :: cldemirad  ! emissivite pour radlwsw,COSP 
-
+      integer iostat
 cIM for NMC files
       missing_val=nf90_fill_real
@@ -1474 +1474 @@
       nCFMIP=npCFMIP
       OPEN(98,file='npCFMIP_param.data',status='old',
-     $          form='formatted',err=999)
+     $          form='formatted',iostat=iostat)
+            if (iostat == 0) then
       READ(98,*,end=998) nCFMIP
 998   CONTINUE
@@ -1506 +1507 @@
      $tabijGCM, lonGCM, latGCM, iGCM, jGCM)
 c
-999      CONTINUE
+            else
+               ALLOCATE(tabijGCM(0))
+               ALLOCATE(lonGCM(0), latGCM(0))
+               ALLOCATE(iGCM(0), jGCM(0))
+            end if
          ENDIF !debut
  

LMDZ4/branches/LMDZ4_AR5/libf/phylmd/printflag.F

@@ -85 +85 @@
        IF( INT( tabcntr0( 6 ) ) .NE. nbapp_rad  )   THEN
         PRINT 21,  INT(tabcntr0(6)), nbapp_rad
-        radpas0  = NINT( 86400./tabcntr0(1)/INT( tabcntr0(6) ) )
+!        radpas0  = NINT( 86400./tabcntr0(1)/INT( tabcntr0(6) ) )
         PRINT 100
-        PRINT 22, radpas0, radpas
+!        PRINT 22, radpas0, radpas
         PRINT 100
        ENDIF