Changeset 8032 for branches

Timestamp:

2023-06-05T11:49:16+02:00 (19 months ago)

Author:

josefine.ghattas

Message:

As done in the trunk [8031] : Corrections to run in debug mode for unsctructured grid. Done by Y. Meurdesoif.
See ticket #923

Location:

branches/ORCHIDEE_2_2/ORCHIDEE

Files:

• . (modified) (1 prop)
• src_parallel/ioipsl_para.f90 (modified) (4 diffs)
• src_sechiba/intersurf.f90 (modified) (1 diff)

branches/ORCHIDEE_2_2/ORCHIDEE/src_parallel/ioipsl_para.f90

@@ -533 +533 @@
     IF (grid_type==unstructured) THEN
  
-      IF (is_root_prc) ALLOCATE(ind_cell_glo_glo(iim_g*jjm_g))
+       IF (is_root_prc) THEN
+          ALLOCATE(ind_cell_glo_glo(iim_g*jjm_g))
+       ELSE
+          ALLOCATE(ind_cell_glo_glo(1))
+       ENDIF
       CALL gather_unindexed(ind_cell_glo,ind_cell_glo_glo)
       IF (is_root_prc)  CALL restget (fid, vname_q, iim, jjm, llm, itau, def_beha, &
@@ -581 +585 @@
 
     IF (grid_type==unstructured) THEN
-      IF (is_root_prc) ALLOCATE(ind_cell_glo_glo(iim_g*jjm_g))
+       IF (is_root_prc) THEN
+          ALLOCATE(ind_cell_glo_glo(iim_g*jjm_g))
+       ELSE
+          ALLOCATE(ind_cell_glo_glo(1))
+       ENDIF
       CALL gather_unindexed(ind_cell_glo,ind_cell_glo_glo)
       IF (is_root_prc)  CALL restget (fid, vname_q, iim, jjm, llm, itau, def_beha, &
@@ -730 +738 @@
 
     IF (grid_type==unstructured) THEN
-      IF (is_root_prc) ALLOCATE(ind_cell_glo_glo(iim_g*jjm_g))
+       IF (is_root_prc) THEN
+          ALLOCATE(ind_cell_glo_glo(iim_g*jjm_g))
+       ELSE
+          ALLOCATE(ind_cell_glo_glo(1))
+       ENDIF
       CALL gather_unindexed(ind_cell_glo,ind_cell_glo_glo)
       IF (is_root_prc) CALL restput(fid, vname_q, iim, jjm, llm, itau, temp_g, MY_OPERATOR, &
@@ -775 +787 @@
     CALL gather(var,temp_g)
     IF (grid_type==unstructured) THEN
-      IF (is_root_prc) ALLOCATE(ind_cell_glo_glo(iim_g*jjm_g))
+       IF (is_root_prc) THEN
+          ALLOCATE(ind_cell_glo_glo(iim_g*jjm_g))
+       ELSE
+          ALLOCATE(ind_cell_glo_glo(1))
+       ENDIF
       CALL gather_unindexed(ind_cell_glo,ind_cell_glo_glo)
       IF (is_root_prc) CALL restput(fid, vname_q, iim, jjm, llm, itau, temp_g, MY_OPERATOR, &

branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/intersurf.f90

@@ -959 +959 @@
     !  Create the internal coordinate table
     !
-    lalo(:,:) = latlon(:,:)
+    IF (grid_loc==unstructured) THEN
+      DO ik=1, kjpindex
+        lalo(ik,:)=latlon(kindex(ik),:)
+      ENDDO    
+    ELSE
+      lalo(:,:) = latlon(:,:)
+    ENDIF
+    
     CALL gather(lalo,lalo_g)
     CALL bcast(lalo_g)