Changeset 953 for codes/icosagcm/trunk/src/diagnostics

Timestamp:

07/15/19 12:29:31 (5 years ago)

Author:

adurocher

Message:

trunk : GPU implementation with OpenACC ( merge from glcp.idris.fr )

Location:

codes/icosagcm/trunk/src/diagnostics

Files:

• check_conserve.f90 (modified) (4 diffs)
• diagflux.F90 (modified) (1 diff)
• observable.f90 (modified) (3 diffs)

codes/icosagcm/trunk/src/diagnostics/check_conserve.f90

@@ -1 +1 @@
 MODULE check_conserve_mod
   USE icosa 
+  USE abort_mod
   IMPLICIT NONE 
 
@@ -28 +29 @@
     USE getin_mod
     USE omp_para, ONLY : is_master
+    USE abort_mod
     CHARACTER(LEN=255) :: check_type_str
     CALL allocate_field(f_pk,field_t,type_real,llm)
@@ -47 +49 @@
        STOP
     END SELECT
+
+    IF (check_type /= check_basic) THEN
+       CALL abort_acc("check_conservation /= 'basic'")
+    END IF
   END SUBROUTINE init_check_conserve
 
@@ -179 +185 @@
     
     IF(check_type == check_detailed) THEN
-
+       CALL abort_acc("!check_detailed")
        CALL transfert_request(f_ue,req_e1_vect)
        CALL pression(f_ps,f_p)

codes/icosagcm/trunk/src/diagnostics/diagflux.F90

@@ -21 +21 @@
   SUBROUTINE init_diagflux
     USE getin_mod
+    USE abort_mod
     INTEGER :: ll
     diagflux_on = .FALSE.
     CALL getin("diagflux", diagflux_on)
+    IF (diagflux_on) THEN
+       CALL abort_acc("diagflux /= .FALSE.")
+    END IF
+
     ll = MERGE(llm,1,diagflux_on)
     CALL allocate_field(f_masst,         field_t,type_real,ll,       name="masst")

codes/icosagcm/trunk/src/diagnostics/observable.f90

@@ -30 +30 @@
     CALL allocate_field(f_buf_s,   field_t,type_real, name="buf_s")
 
-    CALL allocate_field(f_theta, field_t,type_real,llm,nqdyn,  name='theta') ! potential temperature
+    CALL allocate_field(f_theta, field_t,type_real,llm,nqdyn,  name='theta', ondevice=.TRUE.) ! potential temperature
     CALL allocate_field(f_pmid,  field_t,type_real,llm,  name='pmid')       ! mid layer pressure
   END SUBROUTINE init_observable
@@ -56 +56 @@
 
     CALL transfert_request(f_ps,req_i1)
+    CALL update_host_field(f_ps)
     
     IF(init) THEN
@@ -109 +110 @@
     
     CALL progonostic_vel_to_horiz(f_geopot, f_ps, f_mass, f_u, f_W, f_buf_uh, f_buf_i)
-    CALL transfert_request(f_buf_uh,req_e1_vect) 
+    CALL transfert_request(f_buf_uh,req_e1_vect)
     CALL un2ulonlat(f_buf_uh, f_buf_ulon, f_buf_ulat)
     IF(init) THEN