Changeset 402 for codes

Timestamp:

06/08/16 02:50:01 (8 years ago)

Author:

ymipsl

Message:

bug fix when porting to gortran (mostly line size >132)

YM

Location:

codes/icosagcm/trunk/src

Files:

• dcmip2016_simple_physics.f90 (modified) (1 diff)
• domain.f90 (modified) (1 diff)
• etat0_dcmip2016_supercell.f90 (modified) (2 diffs)
• mpipara.F90 (modified) (1 diff)
• physics.f90 (modified) (1 diff)

codes/icosagcm/trunk/src/dcmip2016_simple_physics.f90

@@ -484 +484 @@
             u(i,k)    = CEm(i,k)*u(i,k-1)+CFu(i,k) 
             v(i,k)    = CEm(i,k)*v(i,k-1)+CFv(i,k)
-            dtdt(i,k)  = dtdt(i,k)+((CE(i,k)*t(i,k-1)*(p0/pmid(i,k-1))**(rair/cpair)+CFt(i,k))*(pmid(i,k)/p0)**(rair/cpair)-t(i,k))/dtime 
+            dtdt(i,k)  = dtdt(i,k)+  &
+                        ((CE(i,k)*t(i,k-1)*(p0/pmid(i,k-1))**(rair/cpair)+CFt(i,k))*(pmid(i,k)/p0)**(rair/cpair)-t(i,k))/dtime 
             t(i,k)    = (CE(i,k)*t(i,k-1)*(p0/pmid(i,k-1))**(rair/cpair)+CFt(i,k))*(pmid(i,k)/p0)**(rair/cpair)
             dqdt(i,k)  = dqdt(i,k)+(CE(i,k)*q(i,k-1)+CFq(i,k)-q(i,k))/dtime

codes/icosagcm/trunk/src/domain.f90

@@ -563 +563 @@
        IF (rank==omp_domain_rank) THEN 
          assigned_domain(ind)=.TRUE.
-         WRITE(*,'(A,I6.6,A,I4.4,A,I4.4,A,I8.8)') "Rank ",mpi_rank,"  task ",rank,"  local domain ",ind,"  global domain ",domloc_glo_ind(ind)
+         WRITE(*,'(A,I6.6,A,I4.4,A,I4.4,A,I8.8)') "Rank ",mpi_rank,"  task ",rank,"  local domain ",ind,  &
+                                                  "  global domain ",domloc_glo_ind(ind)
        ELSE
          assigned_domain(ind)=.FALSE.

codes/icosagcm/trunk/src/etat0_dcmip2016_supercell.f90

@@ -55 +55 @@
     
     INTEGER :: l,ij
+    INTEGER,PARAMETER :: perturbation = 1
+    
     REAL(rstd) :: p,z, thetav,rho
  
@@ -60 +62 @@
     DO ij=1,ngrid
        z=0.
-       CALL supercell_z(lon(ij), lat(ij), z, ps(ij), thetav, rho, q(ij,1,1), 0)
+       CALL supercell_z(lon(ij), lat(ij), z, ps(ij), thetav, rho, q(ij,1,1), perturbation)
        DO l=ll_begin,ll_end
          p=0.5*(ap(l)+ap(l+1) + (bp(l)+bp(l+1)) * ps(ij))
-         CALL supercell_test(lon(ij),lat(ij),p,z,0,ulon(ij,l),ulat(ij,l),temp(ij,l),thetav, ps(ij),rho, q(ij,l,1),0) 
+         CALL supercell_test(lon(ij),lat(ij),p,z,0,ulon(ij,l),ulat(ij,l),temp(ij,l),thetav, ps(ij),rho, q(ij,l,1),perturbation) 
        END DO
     END DO

codes/icosagcm/trunk/src/mpipara.F90

@@ -10 +10 @@
   LOGICAL,SAVE :: is_mpi_root
   LOGICAL,SAVE :: is_mpi_master
-  LOGICAL,SAVE :: mpi_master
+  INTEGER,SAVE :: mpi_master
   
   

codes/icosagcm/trunk/src/physics.f90

@@ -5 +5 @@
   PRIVATE
 
-  INTEGER, PARAMETER :: phys_none=0, phys_HS94=1, phys_DCMIP=2, phys_lmdz_generic=3, phys_LB2012=4, phys_external=5, phys_DCMIP2016=6
+  INTEGER, PARAMETER :: phys_none=0, phys_HS94=1, phys_DCMIP=2, phys_lmdz_generic=3, phys_LB2012=4, phys_external=5,&
+                        phys_DCMIP2016=6
 
   INTEGER :: phys_type