Changeset 496

Timestamp:

11/07/16 13:13:40 (8 years ago)

Author:

ymipsl

Message:

Restart from file, need to update redondant cells on frontier.

YM

Location:

codes/icosagcm/trunk/src

Files:

• etat0_start_file.f90 (modified) (5 diffs)
• write_etat0.f90 (modified) (1 diff)

codes/icosagcm/trunk/src/etat0_start_file.f90

@@ -25 +25 @@
   USE transfert_mod
   USE omp_para
+  USE checksum_mod
   IMPLICIT NONE
     TYPE(t_field),POINTER :: f_ps(:)
@@ -43 +44 @@
       CALL allocate_field(f_theta_rhodz_1d,field_t,type_real,llm,name='theta_rhodz')
 
-
+!$OMP BARRIER
+       DO ind=1, ndomain
+         IF (.NOT. assigned_domain(ind) .OR. .NOT. is_omp_level_master) CYCLE
+         f_q(ind)%rval4d(:,:,:)=0.
+       ENDDO
+!$OMP BARRIER
+      CALL checksum(f_q)
       IF (.NOT. etat0_start_file_colocated) THEN    
         CALL allocate_field(f_ulon,field_t,type_real,llm,name='ulon')
@@ -49 +56 @@
         CALL read_start(itau0,f_ps,f_phis,f_theta_rhodz_1d,f_u, f_q)
         CALL transfert_request(f_ps,req_i1)
+        CALL transfert_request(f_ps,req_i0)
         CALL transfert_request(f_phis,req_i1)
+        CALL transfert_request(f_phis,req_i0)
         CALL transfert_request(f_theta_rhodz_1d,req_i1)
+        CALL transfert_request(f_theta_rhodz_1d,req_i0)
         CALL transfert_request(f_q,req_i1)
+        CALL transfert_request(f_q,req_i0)
         CALL transfert_request(f_u,req_e1_vect)
         CALL transfert_request(f_u,req_e0_vect)
@@ -64 +75 @@
         CALL read_start(itau0,f_ps,f_phis,f_theta_rhodz_1d,f_ulon,f_ulat, f_q)
         CALL transfert_request(f_ulat,req_i1)
+        CALL transfert_request(f_ulat,req_i0)
         CALL transfert_request(f_ulon,req_i1)
+        CALL transfert_request(f_ulon,req_i0)
 
         CALL ulonlat2un(f_ulon,f_ulat,f_u)
 
         CALL transfert_request(f_ps,req_i1)
+        CALL transfert_request(f_ps,req_i0)
         CALL transfert_request(f_phis,req_i1)
+        CALL transfert_request(f_phis,req_i0)
         CALL transfert_request(f_theta_rhodz_1d,req_i1)
+        CALL transfert_request(f_theta_rhodz_1d,req_i0)
         CALL transfert_request(f_q,req_i1)
+        CALL transfert_request(f_q,req_i0)
         CALL transfert_request(f_u,req_e1_vect)
+        CALL transfert_request(f_u,req_e0_vect)
         
         CALL deallocate_field(f_ulon)
@@ -80 +98 @@
 !$OMP BARRIER    
     DO ind=1, ndomain
-       IF (.NOT. assigned_domain(ind) .AND. is_omp_level_master) CYCLE
+       IF (.NOT. assigned_domain(ind) .OR. .NOT. is_omp_level_master) CYCLE
        theta_rhodz=f_theta_rhodz(ind) ; theta_rhodz_1d=f_theta_rhodz_1d(ind)
        theta_rhodz(:,:,1)=theta_rhodz_1d(:,:)

codes/icosagcm/trunk/src/write_etat0.f90

@@ -34 +34 @@
 !$OMP BARRIER    
     DO ind=1, ndomain
-       IF (.NOT. assigned_domain(ind) .AND. is_omp_level_master) CYCLE
+       IF (.NOT. assigned_domain(ind) .OR. .NOT. is_omp_level_master) CYCLE
        theta_rhodz=f_theta_rhodz(ind) ; theta_rhodz_1d=f_theta_rhodz_1d(ind)
        theta_rhodz_1d(:,:)=theta_rhodz(:,:,1)