Changeset 3967

Timestamp:

Jul 26, 2021, 11:24:59 AM (3 years ago)

Author:

acozic

Message:

get_var2 can now work with 3d variables which don't have a fourth time axis dimension in start.nc

Solve first part of ticket #133

File:

• LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.F90 (modified) (1 diff)

LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.F90

@@ -225 +225 @@
 END SUBROUTINE get_var1
 
-
 SUBROUTINE get_var2(var,v)
   CHARACTER(LEN=*), INTENT(IN)  :: var
   REAL,             INTENT(OUT) :: v(:,:)
-  REAL,             ALLOCATABLE :: w4(:,:,:,:)
+  REAL,             ALLOCATABLE :: w4(:,:,:,:), w3(:,:,:)
   INTEGER :: nn(4), dids(4), k, nd
+
+
   CALL err(NF90_INQ_VARID(fID,var,vID),"inq",var)
-  ierr=NF90_INQUIRE_VARIABLE(fID,vID,dimids=dids,ndims=nd)
+  ierr=NF90_INQUIRE_VARIABLE(fID,vID,ndims=nd)
+
+  IF(nd==1) THEN
+    CALL err(NF90_GET_VAR(fID,vID,v),"get",var); RETURN
+  END IF
+  ierr=NF90_INQUIRE_VARIABLE(fID,vID,dimids=dids)
+
   DO k=1,nd; ierr=NF90_INQUIRE_DIMENSION(fID,dids(k),len=nn(k)); END DO
-  ALLOCATE(w4(nn(1),nn(2),nn(3),nn(4)))
-  CALL err(NF90_GET_VAR(fID,vID,w4),"get",var)
-  v=RESHAPE(w4,[nn(1)*nn(2),nn(3)]); DEALLOCATE(w4)
+
+  SELECT CASE(nd)
+  CASE(3); ALLOCATE(w3(nn(1),nn(2),nn(3)))
+     CALL err(NF90_GET_VAR(fID,vID,w3),"get",var)
+     v=RESHAPE(w3,[nn(1)*nn(2),nn(3)]); DEALLOCATE(w3)
+  CASE(4);  ALLOCATE(w4(nn(1),nn(2),nn(3),nn(4)))
+     CALL err(NF90_GET_VAR(fID,vID,w4),"get",var)
+     v=RESHAPE(w4,[nn(1)*nn(2),nn(3)]); DEALLOCATE(w4)
+  END SELECT
 END SUBROUTINE get_var2