Changeset 599 for codes/icosagcm/trunk/src/physics

Timestamp:

10/19/17 17:04:26 (7 years ago)

Author:

dubos

Message:

trunk : backported commits r582-r598 (transport diagnostics)

Location:

codes/icosagcm/trunk/src/physics

Files:

• physics.f90 (modified) (3 diffs)
• physics_lmdz_generic.F90 (modified) (3 diffs)

codes/icosagcm/trunk/src/physics/physics.f90

@@ -247 +247 @@
 
     REAL(rstd) :: p(iim*jjm,llm+1)
-    REAL(rstd) :: uc(iim*jjm,3,llm)
+    REAL(rstd) :: uc(iim*jjm,llm,3)
     REAL(rstd) :: ulon(iim*jjm,llm)
     REAL(rstd) :: ulat(iim*jjm,llm)
@@ -311 +311 @@
     REAL(rstd) :: dulat(iim*jjm,llm)
     REAL(rstd) :: ue(3*iim*jjm,llm)
-    REAL(rstd) :: duc(iim*jjm,3,llm)
+    REAL(rstd) :: duc(iim*jjm,llm,3)
     REAL(rstd) :: dt2, due
     INTEGER :: i,j,ij,l
@@ -321 +321 @@
         DO i=ii_begin,ii_end
           ij=(j-1)*iim+i
-          due = sum( (duc(ij,:,l) + duc(ij+t_right,:,l))*ep_e(ij+u_right,:) )
+          due = sum( (duc(ij,l,:) + duc(ij+t_right,l,:))*ep_e(ij+u_right,:) )
           ue(ij+u_right,l) = ue(ij+u_right,l) + dt2*due
 
-          due = sum( (duc(ij,:,l) + duc(ij+t_lup,:,l))*ep_e(ij+u_lup,:) )
+          due = sum( (duc(ij,l,:) + duc(ij+t_lup,l,:))*ep_e(ij+u_lup,:) )
           ue(ij+u_lup,l)=ue(ij+u_lup,l) + dt2*due
 
-          due = sum( (duc(ij,:,l) + duc(ij+t_ldown,:,l))*ep_e(ij+u_ldown,:) )
+          due = sum( (duc(ij,l,:) + duc(ij+t_ldown,l,:))*ep_e(ij+u_ldown,:) )
           ue(ij+u_ldown,l)=ue(ij+u_ldown,l) + dt2*due
         ENDDO

codes/icosagcm/trunk/src/physics/physics_lmdz_generic.F90

@@ -78 +78 @@
     CALL allocate_field(f_dq,field_t,type_real,llm,nqtot)
     CALL allocate_field(f_dps,field_t,type_real)
-    CALL allocate_field(f_duc,field_t,type_real,3,llm)    
+    CALL allocate_field(f_duc,field_t,type_real,llm,3)
 !$OMP END PARALLEL    
 
@@ -362 +362 @@
           DO i=ii_begin,ii_end
             ij=(j-1)*iim+i
-            duc(ij,:,l)=dulon(ij,l)*elon_i(ij,:)+dulat(ij,l)*elat_i(ij,:)
+            duc(ij,l,:)=dulon(ij,l)*elon_i(ij,:)+dulat(ij,l)*elat_i(ij,:)
           ENDDO
         ENDDO
@@ -371 +371 @@
           DO i=ii_begin,ii_end
             ij=(j-1)*iim+i
-            u(ij+u_right,l) = u(ij+u_right,l) + dtphy * sum( 0.5*(duc(ij,:,l) + duc(ij+t_right,:,l))*ep_e(ij+u_right,:) )
-            u(ij+u_lup,l) = u(ij+u_lup,l) + dtphy * sum( 0.5*(duc(ij,:,l) + duc(ij+t_lup,:,l))*ep_e(ij+u_lup,:) )
-            u(ij+u_ldown,l) = u(ij+u_ldown,l) + dtphy*sum( 0.5*(duc(ij,:,l) + duc(ij+t_ldown,:,l))*ep_e(ij+u_ldown,:) )
+            u(ij+u_right,l) = u(ij+u_right,l) + dtphy * sum( 0.5*(duc(ij,l,:) + duc(ij+t_right,l,:))*ep_e(ij+u_right,:) )
+            u(ij+u_lup,l) = u(ij+u_lup,l) + dtphy * sum( 0.5*(duc(ij,l,:) + duc(ij+t_lup,l,:))*ep_e(ij+u_lup,:) )
+            u(ij+u_ldown,l) = u(ij+u_ldown,l) + dtphy*sum( 0.5*(duc(ij,l,:) + duc(ij+t_ldown,l,:))*ep_e(ij+u_ldown,:) )
           ENDDO
         ENDDO