Changeset 1013

Timestamp:

02/28/20 09:56:31 (4 years ago)

Author:

ymipsl

Message:

1j+1j=2j : (x / r) * r /= x due to rounding error. So at restart a run did not have exactly the same metric than the previous run.

YM

File:

• codes/icosagcm/trunk/src/output/write_etat0.f90 (modified) (3 diffs)

codes/icosagcm/trunk/src/output/write_etat0.f90

@@ -13 +13 @@
   USE omp_para
   USE xios_mod
+  USE checksum_mod
   IMPLICIT NONE
     INTEGER,INTENT(IN)    :: it
@@ -29 +30 @@
     REAL(rstd), POINTER :: theta_rhodz(:,:,:),theta_rhodz_1d(:,:)
     REAL(rstd), POINTER :: xcell(:), ycell(:), zcell(:)
-    INTEGER :: ind
+    INTEGER :: ind,n,i,j
     
     
@@ -41 +42 @@
 !$OMP BARRIER    
     DO ind=1, ndomain
-       IF (.NOT. assigned_domain(ind) .OR. .NOT. is_omp_level_master) CYCLE
-       CALL swap_dimensions(ind)
-       CALL swap_geometry(ind)
-       theta_rhodz=f_theta_rhodz(ind) ; theta_rhodz_1d=f_theta_rhodz_1d(ind)
-       theta_rhodz_1d(:,:)=theta_rhodz(:,:,1)
-       xcell=f_xcell(ind) ; xcell=xyz_i(:,1)/radius
-       ycell=f_ycell(ind) ; ycell=xyz_i(:,2)/radius
-       zcell=f_zcell(ind) ; zcell=xyz_i(:,3)/radius
+      IF (.NOT. assigned_domain(ind) .OR. .NOT. is_omp_level_master) CYCLE
+      CALL swap_dimensions(ind)
+      CALL swap_geometry(ind)
+      theta_rhodz=f_theta_rhodz(ind) ; theta_rhodz_1d=f_theta_rhodz_1d(ind)
+      theta_rhodz_1d(:,:)=theta_rhodz(:,:,1)
+   
+      xcell=f_xcell(ind) ; ! xcell=xyz_i(:,1)/radius  => cannot use due to rounding error
+      ycell=f_ycell(ind) ; ! ycell=xyz_i(:,2)/radius  => for 1+1=2
+      zcell=f_zcell(ind) ; ! zcell=xyz_i(:,3)/radius
+
+      DO j=jj_begin,jj_end
+        DO i=ii_begin,ii_end
+          n=(j-1)*iim+i
+          xcell(n) = domain(ind)%xyz(1,i,j) ! not the best but for now it works
+          ycell(n) = domain(ind)%xyz(2,i,j) 
+          zcell(n) = domain(ind)%xyz(3,i,j) 
+        ENDDO
+      ENDDO       
     ENDDO