Changeset 1011

Timestamp:

01/21/20 00:16:21 (4 years ago)

Author:

dubos

Message:

devel : bugfix, missing halo exchange before call to physics_column

Location:

codes/icosagcm/devel/src/physics

Files:

• physics.f90 (modified) (5 diffs)
• physics_interface.f90 (modified) (3 diffs)

codes/icosagcm/devel/src/physics/physics.f90

@@ -170 +170 @@
        ! du_phys increases by u(after physics) - u (before physics)
        CALL add_du_phys(-1., f_ue)
-
+       
        SELECT CASE(phys_type)
        CASE(phys_HS94)
@@ -179 +179 @@
          CALL physics_external(it ,f_phis, f_ps, f_theta_rhodz, f_ue, f_wflux, f_q)
        CASE DEFAULT
+          CALL transfert_request(f_ue, req_e1_vect)
           CALL physics_column(it, f_phis, f_geopot, f_ps, f_theta_rhodz, f_ue, f_q)
        END SELECT
@@ -239 +240 @@
     INTEGER :: it, ind
 
+    physics_inout%it = it
+
     CALL theta_rhodz2temperature(f_ps,f_theta_rhodz,f_temp)
     
@@ -281 +284 @@
        dulon=f_dulon(ind)
        dulat=f_dulat(ind)
+       ! unpack_physics updates temp and q ; a transfer is required before updating u
        CALL unpack_physics(pack_info(ind), ps, temp, q, dulon, dulat)
     END DO
@@ -323 +327 @@
 
 !$OMP BARRIER
-    CALL compute_pression(ps,p,0)
+    CALL compute_pression(ps,p,0) ! pressure at interfaces
 !$OMP BARRIER
     CALL compute_exner(ps,p,pks,pk,0) 

codes/icosagcm/devel/src/physics/physics_interface.f90

@@ -7 +7 @@
   TYPE t_physics_inout
      ! Input, time-independent
-     INTEGER :: ngrid
+     INTEGER :: ngrid, it
      REAL(rstd) :: dt_phys
-     REAL(rstd), DIMENSION(:), POINTER :: Ai, lon, lat, phis
+     REAL(rstd), DIMENSION(:), ALLOCATABLE :: Ai, lon, lat, phis
      ! Input, time-dependent
-     REAL(rstd), DIMENSION(:,:), POINTER :: geopot, p, pk, Temp, ulon, ulat
-     REAL(rstd), DIMENSION(:,:,:), POINTER :: q
+     REAL(rstd), DIMENSION(:,:), ALLOCATABLE :: geopot, p, pk, Temp, ulon, ulat
+     REAL(rstd), DIMENSION(:,:,:), ALLOCATABLE :: q
      ! Output arrays
-     REAL(rstd), DIMENSION(:,:), POINTER :: dTemp, dulon, dulat
-     REAL(rstd), DIMENSION(:,:,:), POINTER :: dq
+     REAL(rstd), DIMENSION(:,:), ALLOCATABLE :: dTemp, dulon, dulat
+     REAL(rstd), DIMENSION(:,:,:), ALLOCATABLE :: dq
   END TYPE t_physics_inout
 
@@ -165 +165 @@
        
     CASE DEFAULT ! Copy non-halo points only, as contiguous segments (works)
-       n=0
+       n(:)=0
        n(jj_begin:jj_end)=COUNT(own(ii_begin:ii_end,jj_begin:jj_end),1)
        ngrid=SUM(n)
@@ -185 +185 @@
              DO i=ii_begin,ii_end
                 IF(own(i,j)) THEN
-                   info%n(jj)=n(j)
-                   info%k(jj)=k
-                   info%ij(jj) = iim*(j-1)+i
+                   info%n(jj)=n(j)              ! size of segment
+                   info%k(jj)=k                 ! start index in packed array
+                   info%ij(jj) = iim*(j-1)+i    ! start index in unpacked array
                    IF(COUNT(own(i:i+n(j)-1,j)) /= n(j)) STOP
                    EXIT