Changeset 681 for codes/icosagcm/devel/src

Timestamp:

02/14/18 00:06:52 (6 years ago)

Author:

dubos

Message:

devel/unstructured : local mesh setup + halo exchange

Location:

codes/icosagcm/devel/src/unstructured

Files:

• data_unstructured.F90 (modified) (2 diffs)
• timestep_unstructured.F90 (modified) (3 diffs)
• transfer_unstructured.F90 (added)

codes/icosagcm/devel/src/unstructured/data_unstructured.F90

@@ -18 +18 @@
        thermo_theta=1, thermo_entropy=2, thermo_moist=3, thermo_boussinesq=4, &
        caldyn_vert_cons=1, max_nb_stage=5
-  INTEGER(C_INT),  BIND(C) :: caldyn_thermo=thermo_theta, caldyn_eta=eta_lag, &
+  INDEX,  BIND(C) :: caldyn_thermo=thermo_theta, caldyn_eta=eta_lag, &
        caldyn_vert_variant=caldyn_vert_cons, nb_threads=0, nb_stage=0
   LOGICAL(C_BOOL), BIND(C) :: hydrostatic=.TRUE., debug_hevi_solver=.TRUE.
@@ -54 +54 @@
        'pvort_only', 'slow_hydro', 'fast      ', 'coriolis  ', 'theta     ', 'geopot    ', 'vert      ', &
        'solver    ', 'slow_NH   ', 'NH_geopot ', 'vert_NH   ',  'update    ' /)
+
+  INTEGER, PARAMETER ::transfer_primal=1, transfer_edge=2, transfer_dual=3, transfer_max=3
+  TYPE Halo_transfer
+     INTEGER :: ranks ! size of arrays rank, len
+     INTEGER, ALLOCATABLE :: rank(:), & ! MPI ranks to communicate with
+          num(:), & ! number of cells to send to / receive from other MPI ranks
+          cells(:) ! local indices of cells to send/receive
+     DBL, ALLOCATABLE :: buf1(:), buf2(:,:), buf3(:,:,:)
+  END TYPE Halo_transfer
+  TYPE(Halo_transfer), TARGET :: send_info(transfer_max), recv_info(transfer_max)
 
 CONTAINS

codes/icosagcm/devel/src/unstructured/timestep_unstructured.F90

@@ -6 +6 @@
 #endif
   USE caldyn_unstructured_mod
+  USE transfer_unstructured_mod
   IMPLICIT NONE
   PRIVATE
@@ -151 +152 @@
        DO stage=1, nb_stage
           
+          CALL update_halo(transfer_primal, rhodz)
+          CALL update_halo(transfer_primal, theta_rhodz(:,:,1)) ! FIXME
+
           IF(hydrostatic) THEN
              
@@ -163 +167 @@
              
              CALL compute_caldyn_fast(tauj(stage), pk,berni,theta,geopot, du_fast(:,:,stage), u)
-             
+             CALL update_halo(transfer_edge, u)
              CALL compute_pvort_only(rhodz,u,qv,qu)
+             CALL update_halo(transfer_edge, qu)
+
              CALL compute_caldyn_slow_hydro(rhodz,theta,u, berni,hflux,du_slow(:,:,stage))
              CALL compute_coriolis(hflux,theta,qu, bufu1, drhodz(:,:,stage), dtheta_rhodz(:,:,:,stage),du_slow(:,:,stage))