Changeset 963 for codes/icosagcm/trunk/src/dissip/dissip_gcm.F90

Timestamp:

07/25/19 11:36:36 (5 years ago)

Author:

adurocher

Message:

Merge 'mpi_rewrite' into trunk

File:

• codes/icosagcm/trunk/src/dissip/dissip_gcm.F90 (modified) (8 diffs)

codes/icosagcm/trunk/src/dissip/dissip_gcm.F90

@@ -4 +4 @@
   PRIVATE
 
-  TYPE(t_field),POINTER,SAVE :: f_due_diss1(:)
-  TYPE(t_field),POINTER,SAVE :: f_due_diss2(:)
+  TYPE(t_field),POINTER,SAVE :: f_due_diss_gradiv(:)
+  TYPE(t_field),POINTER,SAVE :: f_due_diss_gradrot(:)
 
   TYPE(t_field),POINTER,SAVE :: f_dtheta_diss(:)
   TYPE(t_field),POINTER,SAVE :: f_dtheta_rhodz_diss(:)
-  TYPE(t_message),SAVE :: req_due, req_dtheta 
+  TYPE(t_message),SAVE :: req_due_gradiv, req_due_gradrot, req_dtheta 
  
   INTEGER,SAVE :: nitergdiv=1
@@ -47 +47 @@
   SUBROUTINE allocate_dissip
   USE icosa
-  IMPLICIT NONE  
-    CALL allocate_field(f_due_diss1,field_u,type_real,llm,ondevice=.TRUE.)
-    CALL allocate_field(f_due_diss2,field_u,type_real,llm,ondevice=.TRUE.)
+  IMPLICIT NONE
+    CALL allocate_field(f_due_diss_gradiv,field_u,type_real,llm,ondevice=.TRUE.)
+    CALL allocate_field(f_due_diss_gradrot,field_u,type_real,llm,ondevice=.TRUE.)
     CALL allocate_field(f_dtheta_diss,field_t,type_real,llm)
     CALL allocate_field(f_dtheta_rhodz_diss,field_t,type_real,llm,ondevice=.TRUE.)
@@ -140 +140 @@
     CALL allocate_field(f_dtheta,field_t,type_real,ondevice=.TRUE.)
     
-    CALL init_message(f_due_diss1,req_e1_vect,req_due)
-    CALL init_message(f_dtheta_diss,req_i1,req_dtheta)
+    CALL init_message(f_due_diss_gradiv,req_e1_vect,req_due_gradiv)
+    CALL init_message(f_due_diss_gradrot,req_e1_vect,req_due_gradrot)
+    CALL init_message(f_dtheta_rhodz_diss,req_i1,req_dtheta)
 
     tau_graddiv(:)=5000
@@ -548 +549 @@
     
     CALL trace_start("dissip")
-    CALL gradiv(f_ue,f_due_diss1)
-    CALL gradrot(f_ue,f_due_diss2)
+    CALL gradiv(f_ue,f_due_diss_gradiv)
+    CALL gradrot(f_ue,f_due_diss_gradrot)
 
     CALL divgrad_theta_rhodz(f_mass,f_theta_rhodz,f_dtheta_rhodz_diss)
@@ -558 +559 @@
       CALL swap_geometry(ind)
       due=f_due(ind) 
-      due_diss1=f_due_diss1(ind)
-      due_diss2=f_due_diss2(ind)
+      due_diss1=f_due_diss_gradiv(ind)
+      due_diss2=f_due_diss_gradrot(ind)
       dtheta_rhodz=f_dtheta_rhodz(ind)
       dtheta_rhodz_diss=f_dtheta_rhodz_diss(ind)
@@ -653 +654 @@
          USE output_field_mod
 
-         CALL transfert_request(f_due_diss1,req_e1_vect)
-         CALL un2ulonlat(f_due_diss1, f_buf_ulon, f_buf_ulat, (1./(tau_graddiv(1))))
+         CALL transfert_request(f_due_diss_gradiv,req_e1_vect)
+         CALL un2ulonlat(f_due_diss_gradiv, f_buf_ulon, f_buf_ulat, (1./(tau_graddiv(1))))
          CALL output_field("dulon_diss1",f_buf_ulon)
          CALL output_field("dulat_diss1",f_buf_ulat)
 !
-         CALL transfert_request(f_due_diss2,req_e1_vect)
-         CALL un2ulonlat(f_due_diss2, f_buf_ulon, f_buf_ulat, (1./(tau_graddiv(1))))
+         CALL transfert_request(f_due_diss_gradrot,req_e1_vect)
+         CALL un2ulonlat(f_due_diss_gradrot, f_buf_ulon, f_buf_ulat, (1./(tau_graddiv(1))))
          CALL output_field("dulon_diss2",f_buf_ulon)
          CALL output_field("dulat_diss2",f_buf_ulat)
@@ -699 +700 @@
 
     DO it=1,nitergdiv
-      CALL send_message(f_due,req_due)
-      CALL wait_message(req_due)
-
+      CALL send_message(f_due,req_due_gradiv)
+      CALL wait_message(req_due_gradiv)
       DO ind=1,ndomain
         IF (.NOT. assigned_domain(ind)) CYCLE
@@ -749 +749 @@
 
     DO it=1,nitergrot
-      CALL send_message(f_due,req_due)
-      CALL wait_message(req_due)
+      CALL send_message(f_due,req_due_gradrot)
+      CALL wait_message(req_due_gradrot)
         
       DO ind=1,ndomain