Changeset 3702 for trunk/LMDZ.MARS

Timestamp:

Mar 31, 2025, 6:04:59 PM (3 months ago)

Author:

emillour

Message:

Mars PCM:
Add reindexing of columns when reading/writing (re)startfi files. This is not
necessary with the lon-lat (LMDZ.COMMON) dynamical core, but required when
using DYNAMICO (where correspondance between dynamics and physics column
indexes changes with number of computing cores).
EM

Location:

trunk/LMDZ.MARS

Files:

• changelog.txt (modified) (1 diff)
• libf/phymars/iostart.F90 (modified) (9 diffs)

trunk/LMDZ.MARS/changelog.txt

@@ -4779 +4779 @@
 == 12/03/2025 == JBC
 Small improvements for the python script to display variables in a NetCDF file.
+
+== 31/03/2025 == EM
+Add reindexing of columns when reading/writing (re)startfi files. This is not
+necessary with the lon-lat (LMDZ.COMMON) dynamical core, but required when
+using DYNAMICO (where correspondance between dynamics and physics column
+indexes changes with number of computing cores).
+

trunk/LMDZ.MARS/libf/phymars/iostart.F90

@@ -20 +20 @@
     INTEGER,SAVE :: idim11 ! "description_size" dimension
     INTEGER,SAVE :: timeindex ! current time index (for time-dependent fields)
+! variables above need not be OMP threadprivate, as they are used by master only
+
     INTEGER,PARAMETER :: length = 100 ! size of tab_cntrl array
     INTEGER,PARAMETER :: ldscrpt = 35 ! size of dscrpt_tab_cntrl array
@@ -271 +273 @@
   SUBROUTINE Get_field_rgen(field_name,field,field_size, &
                             corners,edges,found)
-  USE netcdf
-  USE dimphy
-  USE mod_grid_phy_lmdz
-  USE mod_phys_lmdz_para
-  IMPLICIT NONE
-    CHARACTER(LEN=*) :: Field_name
-    INTEGER          :: field_size
-    REAL             :: field(klon,field_size)
+  USE netcdf, ONLY: NF90_INQ_VARID, NF90_GET_VAR, NF90_NOERR
+  USE dimphy, ONLY: klon ! number of columns on local grid
+  USE geometry_mod, ONLY: ind_cell_glo
+  USE mod_grid_phy_lmdz, ONLY: klon_glo ! number of columns on global grid
+  USE mod_phys_lmdz_para, ONLY: is_master, bcast, scatter, gather
+  IMPLICIT NONE
+    CHARACTER(LEN=*),INTENT(IN) :: Field_name
+    INTEGER,INTENT(IN) :: field_size
+    REAL,INTENT(OUT) :: field(klon,field_size)
     INTEGER,INTENT(IN) :: corners(4)
     INTEGER,INTENT(IN) :: edges(4)
-    LOGICAL,OPTIONAL :: found
-    
-    REAL    :: field_glo(klon_glo,field_size)
+    LOGICAL,OPTIONAL,INTENT(OUT) :: found
+    
+    REAL :: field_glo(klon_glo,field_size) ! field on global grid
+    REAL :: field_glo_tmp(klon_glo,field_size)
+    INTEGER :: ind_cell_glo_glo(klon_glo) ! cell indexes on global grid
     LOGICAL :: tmp_found
     INTEGER :: varid
-    INTEGER :: ierr
-    
+    INTEGER :: ierr, i
+    
+    ! gather columns indexes on global grid
+    CALL gather(ind_cell_glo,ind_cell_glo_glo)
+     
     IF (is_master) THEN
   
@@ -293 +301 @@
       
       IF (ierr==NF90_NOERR) THEN
-        CALL body(field_glo)
+        CALL body(field_glo_tmp)
         tmp_found=.TRUE.
       ELSE
@@ -299 +307 @@
       ENDIF
     
-    ENDIF
+    ENDIF ! of IF (is_master)
     
     CALL bcast(tmp_found)
 
     IF (tmp_found) THEN
+      IF (is_master) THEN
+        ! reorder columns according to ind_cell_glo(:) indexes
+        DO i=1,klon_glo
+          field_glo(i,:)=field_glo_tmp(ind_cell_glo_glo(i),:)
+        ENDDO
+      ENDIF
       CALL scatter(field_glo,field)
     ENDIF
@@ -326 +340 @@
            PRINT*, 'get_field_rgen: Failed reading <'//field_name//'>'
 
-!           IF (field_name=='CLWCON' .OR. field_name=='RNEBCON' .OR. field_name=='RATQS') THEN
-!              ! Essaye de lire le variable sur surface uniqument, comme fait avant
-!              field_glo(:)=0.
-!              ierr=NF90_GET_VAR(nid_start,varid,field_glo(1:klon_glo))
-!              IF (ierr/=NF90_NOERR) THEN
-!                 PRINT*, 'phyetat0: Lecture echouee aussi en 2D pour <'//field_name//'>'
-!                 CALL abort
-!              ELSE
-!                 PRINT*, 'phyetat0: La variable <'//field_name//'> lu sur surface seulement'!, selon ancien format, le reste mis a zero'
-!              END IF
-!           ELSE
-              CALL abort_physic("get_field_rgen","Failed to read field",1)
-!           ENDIF
+           CALL abort_physic("get_field_rgen","Failed to read field",1)
          ENDIF
 
@@ -410 +412 @@
 
   SUBROUTINE Get_var_rgen(var_name,var,var_size,found)
-  USE netcdf
-  USE dimphy
-  USE mod_grid_phy_lmdz
-  USE mod_phys_lmdz_para
-  IMPLICIT NONE
-    CHARACTER(LEN=*) :: var_name
-    INTEGER          :: var_size
-    REAL             :: var(var_size)
-    LOGICAL,OPTIONAL :: found
+  USE netcdf, ONLY: NF90_INQ_VARID, NF90_GET_VAR, NF90_NOERR
+  USE mod_phys_lmdz_para, ONLY: is_master, bcast
+  IMPLICIT NONE
+    CHARACTER(LEN=*),INTENT(IN) :: var_name
+    INTEGER,INTENT(IN) :: var_size
+    REAL,INTENT(OUT) :: var(var_size)
+    LOGICAL,OPTIONAL,INTENT(OUT) :: found
     
     LOGICAL :: tmp_found
@@ -424 +424 @@
     INTEGER :: ierr
     
-    IF (is_mpi_root .AND. is_omp_root) THEN
+    IF (is_master) THEN
   
       ierr=NF90_INQ_VARID(nid_start,var_name,varid)
@@ -669 +669 @@
   
   SUBROUTINE put_field_rgen(field_name,title,field,field_size,time)
-  USE netcdf
-  USE dimphy
+  USE netcdf, ONLY: NF90_REDEF, NF90_ENDDEF, NF90_DEF_VAR, NF90_PUT_ATT, &
+                    NF90_INQ_VARID, NF90_PUT_VAR, NF90_STRERROR, &
+                    NF90_NOERR, NF90_FLOAT, NF90_DOUBLE
+  USE dimphy, ONLY: klon, klev, klevp1
   USE comsoil_h, only: nsoilmx
   USE comslope_mod, ONLY: nslope
-  USE mod_grid_phy_lmdz
-  USE mod_phys_lmdz_para
+  USE mod_grid_phy_lmdz, ONLY: klon_glo
+  USE mod_phys_lmdz_para, ONLY: is_master, gather
+  USE geometry_mod, ONLY: ind_cell_glo
+  
   IMPLICIT NONE
   CHARACTER(LEN=*),INTENT(IN)    :: field_name
@@ -682 +686 @@
   REAL,OPTIONAL,INTENT(IN)       :: time
   
-  REAL                           :: field_glo(klon_glo,field_size)
-  REAL                           :: field_glo_reshape(klon_glo,nsoilmx,nslope,timeindex)
+  REAL :: field_glo(klon_glo,field_size)
+  REAL :: field_glo_tmp(klon_glo,field_size)
+  INTEGER :: ind_cell_glo_glo(klon_glo) ! cell indexes on global grid
+  REAL :: field_glo_reshape(klon_glo,nsoilmx,nslope,timeindex)
   INTEGER                        :: ierr
   INTEGER                        :: nvarid
   INTEGER                        :: idim
+  INTEGER :: i
    
-    CALL gather(field,field_glo)
-    
-    IF (is_master) THEN
+    ! gather indexes on global grid
+    CALL gather(ind_cell_glo,ind_cell_glo_glo)
+    ! gather field on master
+    CALL gather(field,field_glo_tmp)
+    
+    IF (is_master) THEN
+      ! reorder columns 
+      DO i=1,klon_glo
+        field_glo(ind_cell_glo_glo(i),:)=field_glo_tmp(i,:)
+      ENDDO
 
       IF (field_size==1) THEN