Changeset 4371 for LMDZ6/trunk/libf

Timestamp:

Dec 7, 2022, 2:58:39 PM (2 years ago)

Author:

Laurent Fairhead

Message:

Bug fix for xios writing in the dynamics. Problem was that a variable that I thought was shared
actually was not leading to undefind values in the variables written out to XIOS
LF

File:

• LMDZ6/trunk/libf/dyn3dmem/mod_xios_dyn3dmem.F90 (modified) (6 diffs)

LMDZ6/trunk/libf/dyn3dmem/mod_xios_dyn3dmem.F90

@@ -29 +29 @@
      MODULE PROCEDURE writefield_dyn1d_v, writefield_dyn2d_v
   END INTERFACE writefield_dyn_v
+
+     REAL, ALLOCATABLE, SAVE :: NewField_U(:,:,:), NewField_V(:,:,:)
   
 
@@ -63 +65 @@
 ! 0 Initialisations
      pi = 4. * ATAN (1.)
+! allocation of fields passed to xios
+!$OMP BARRIER
+!$OMP MASTER
+     allocate(NewField_U(iip1, jj_begin:jj_end, llm))
+     allocate(NewField_V(iip1, jj_begin:jj_end, llm))     
+!$OMP END MASTER
+!$OMP BARRIER
 
 ! 1 Context initialisation
@@ -151 +160 @@
      CHARACTER(LEN=*)   :: name
      REAL, DIMENSION(ij_begin:ij_end,llm) :: Field
-     REAL, DIMENSION(iip1, jj_begin:jj_end,llm) :: NewField
+!     REAL, ALLOCATABLE, SAVE :: NewField(:,:,:)
      INTEGER :: i,j,l, count
 
-!$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
+!!!!!$OMP BARRIER
+!!!!!$OMP MASTER
+!!!!     allocate(NewField(iip1, jj_begin:jj_end, llm))
+!!!!!$OMP END MASTER
+!!!!!$OMP BARRIER
+
+
+!$OMP DO SCHEDULE(STATIC,OMP_CHUNK) 
      DO l = 1, llm
-       NewField(:,jj_begin:jj_end,l)=reshape(Field(ij_begin:ij_end,l),(/iip1,jj_nb/))
+       NewField_U(:,jj_begin:jj_end,l)=reshape(Field(ij_begin:ij_end,l),(/iip1,jj_nb/))
      ENDDO
 !$OMP ENDDO
@@ -162 +178 @@
 
 !$OMP MASTER
-!!     write(14,*)'iip1,ij_begin,ij_end,llm,jj_begin,jj_end,jj_nb ',iip1,ij_begin,ij_end,llm,jj_begin,jj_end,jj_nb
-
-     CALL xios_send_field(name, NewField)
-!$OMP END MASTER   
+     CALL xios_send_field(name, NewField_U)
+!!!!     DEALLOCATE(NewField)
+!$OMP END MASTER   
+!$OMP BARRIER
   
    END SUBROUTINE  writefield_dyn2d_u
@@ -207 +223 @@
      CHARACTER(LEN=*)   :: name
      REAL, DIMENSION(ij_begin:ij_end,llm) :: Field
-     REAL, DIMENSION(iip1,  jj_begin:jj_end,llm) :: NewField
+!!!!     REAL, ALLOCATABLE, SAVE :: NewField(:,:,:)
      INTEGER :: l, jje, ije, jjn
+
+!!!!!$OMP BARRIER
+!!!!!$OMP MASTER
+!!!!     allocate(NewField(iip1,  jj_begin:jj_end,llm))
+!!!!!$OMP END MASTER
+!!!!!$OMP BARRIER
 
      IF (pole_sud) THEN
@@ -223 +245 @@
 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
      DO l = 1, llm
-        NewField(:,jj_begin:jje,l)=reshape(Field(ij_begin:ije,l),(/iip1,jjn/))
+        NewField_V(:,jj_begin:jje,l)=reshape(Field(ij_begin:ije,l),(/iip1,jjn/))
      ENDDO
 !$OMP ENDDO
-
 !$OMP BARRIER       
-!$OMP MASTER
-     CALL xios_send_field(name, NewField(:,jj_begin:jje,:))
-!$OMP END MASTER   
+
+!$OMP MASTER
+     CALL xios_send_field(name, NewField_V(:,jj_begin:jje,:))
+!!!!     DEALLOCATE(NewField)
+!$OMP END MASTER   
+!$OMP BARRIER 
   
    END SUBROUTINE  writefield_dyn2d_v