Changeset 119 for codes/icosagcm/trunk

Timestamp:

01/17/13 23:58:19 (11 years ago)

Author:

dubos

Message:

Fixed issues with optional args in write_field

File:

• codes/icosagcm/trunk/src/write_field.f90 (modified) (20 diffs)

codes/icosagcm/trunk/src/write_field.f90

@@ -72 +72 @@
       INTEGER,OPTIONAL,INTENT(IN) :: nind
       LOGICAL,OPTIONAL,INTENT(IN) :: once
+      LOGICAL                     :: once_
       
       TYPE(t_field),POINTER :: field_glo(:)
       
+      IF(PRESENT(once)) THEN
+         once_=once
+      ELSE
+         once_=.FALSE.
+      END IF
+
       IF (field(1)%ndim==2) THEN
         CALL allocate_field_glo(field_glo,field(1)%field_type,field(1)%data_type)
@@ -87 +94 @@
       IF (mpi_rank==0) THEN
         IF (PRESENT(nind)) THEN
-         CALL writefield_gen(name_in,field_glo,domain_glo,nind,once=once)
+         CALL writefield_gen(name_in,field_glo,domain_glo,nind,once=once_)
         ELSE
-         CALL writefield_gen(name_in,field_glo,domain_glo,1,ndomain_glo,once=once)
+         CALL writefield_gen(name_in,field_glo,domain_glo,1,ndomain_glo,once=once_)
         ENDIF
       ENDIF
@@ -337 +344 @@
       REAL(r8),ALLOCATABLE :: field_val3d(:,:)
       REAL(r8),ALLOCATABLE :: field_val4d(:,:,:)
-      LOGICAL,OPTIONAL, INTENT(IN) :: once
+      LOGICAL, INTENT(IN) :: once
       TYPE(t_domain),POINTER :: d
       INTEGER :: Index
@@ -348 +355 @@
       INTEGER :: halo_size
       LOGICAL :: single
-      
       
       name=TRIM(ADJUSTL(name_in))
@@ -412 +418 @@
           ENDDO
 
-          IF (PRESENT(once) .AND. once) THEN 
+          IF (once) THEN 
             status=NF90_PUT_VAR(FieldId(Index),FieldVarId(index)%nc_id(1),Field_val2d,  &
                                start=(/ 1 /),count=(/ncell /))
@@ -437 +443 @@
           ENDDO
            
-          IF (PRESENT(once) .AND. once) THEN 
+          IF (once) THEN 
             status=NF90_PUT_VAR(FieldId(Index),FieldVarId(index)%nc_id(1),Field_val3d,start=(/ 1,1 /),   &
                                  count=(/ncell,size(field(1)%rval3d,2) /))
@@ -465 +471 @@
             ENDDO
             
-            IF (PRESENT(once) .AND. once) THEN 
+            IF (once) THEN 
               status=NF90_PUT_VAR(FieldId(Index),FieldVarId(index)%nc_id(q),Field_val3d,start=(/ 1,1 /),   &
                                  count=(/ncell,size(field(1)%rval4d,2),1 /))
@@ -524 +530 @@
           ENDDO
           
-          IF (PRESENT(once) .AND. once) THEN 
+          IF (once) THEN 
             status=NF90_PUT_VAR(FieldId(Index),FieldVarId(index)%nc_id(1),                       &
                                 Field_val2d,start=(/ 1 /),count=(/ncell /))
@@ -555 +561 @@
           ENDDO
           
-          IF (PRESENT(once) .AND. once) THEN 
+          IF (once) THEN 
             status=NF90_PUT_VAR(FieldId(Index),FieldVarId(index)%nc_id(1),Field_val3d,start=(/ 1,1 /),   &
                                 count=(/ncell,size(field(1)%rval3d,2) /))
@@ -588 +594 @@
             ENDDO
 
-            IF (PRESENT(once) .AND. once) THEN 
+            IF (once) THEN 
               status=NF90_PUT_VAR(FieldId(Index),FieldVarId(index)%nc_id(q),Field_val3d,start=(/ 1,1,1 /),   &
                                   count=(/ncell,size(field(1)%rval4d,2) /))
@@ -1161 +1167 @@
       INTEGER,OPTIONAL,INTENT(IN) :: ind_b_in
       INTEGER,OPTIONAL,INTENT(IN) :: ind_e_in
-      LOGICAL,OPTIONAL,INTENT(IN) :: once
+      LOGICAL,INTENT(IN) :: once
       
       INTEGER :: ncell
@@ -1258 +1264 @@
 
         IF (Field(ind_b)%ndim==2) THEN
-          IF (PRESENT(once) .AND. once) THEN 
+          IF (once) THEN 
             status = NF90_DEF_VAR(ncid,TRIM(ADJUSTL(name)),ncprec,(/ ncellId /),FieldVarId(NbField)%nc_id(1))
           ELSE
@@ -1265 +1271 @@
           status = NF90_PUT_ATT(ncid,FieldVarId(NbField)%nc_id(1),"coordinates","lon_i lat_i")
         ELSE IF (Field(ind_b)%ndim==3) THEN
-          IF (PRESENT(once) .AND. once) THEN 
+          IF (once) THEN 
             status = NF90_DEF_VAR(ncid,TRIM(ADJUSTL(name)),ncprec,(/ ncellId,dim3id /),FieldVarId(NbField)%nc_id(1))
           ELSE
@@ -1273 +1279 @@
         ELSE IF (Field(ind_b)%ndim==4) THEN
           DO i=1,FieldVarId(NbField)%size
-            IF (PRESENT(once) .AND. once) THEN 
+            IF (once) THEN 
               status = NF90_DEF_VAR(ncid,TRIM(ADJUSTL(name))//int2str(i),ncprec,(/ ncellId,dim3id /),  &
                                     FieldVarId(NbField)%nc_id(i))
@@ -1382 +1388 @@
 
         IF (Field(ind_b)%ndim==2) THEN
-          IF (PRESENT(once) .AND. once) THEN 
+          IF (once) THEN 
             status = NF90_DEF_VAR(ncid,TRIM(ADJUSTL(name)),ncprec,(/ ncellId /),FieldVarId(NbField)%nc_id(1))
           ELSE
@@ -1389 +1395 @@
           status = NF90_PUT_ATT(ncid,FieldVarId(NbField)%nc_id(1),"coordinates","lon_v lat_v")
         ELSE IF (Field(ind_b)%ndim==3) THEN
-          IF (PRESENT(once) .AND. once) THEN 
+          IF (once) THEN 
             status = NF90_DEF_VAR(ncid,TRIM(ADJUSTL(name)),ncprec,(/ ncellId,dim3id /),FieldVarId(NbField)%nc_id(1))
           ELSE
@@ -1397 +1403 @@
         ELSE IF (Field(ind_b)%ndim==4) THEN
           DO q=1,FieldVarId(NbField)%size
-            IF (PRESENT(once) .AND. once) THEN 
+            IF (once) THEN 
               status = NF90_DEF_VAR(ncid,TRIM(ADJUSTL(name)//int2str(q)),ncprec,             &
                                     (/ ncellId,dim3id /),FieldVarId(NbField)%nc_id(q))
@@ -1510 +1516 @@
     IMPLICIT NONE
       CHARACTER(LEN=*) :: name
+      CHARACTER(LEN=LEN_TRIM(ADJUSTL(name))) :: name_adj
       TYPE(t_field),POINTER :: field(:)
       INTEGER,OPTIONAL,INTENT(IN) :: nind
@@ -1530 +1537 @@
           
       NbField=NbField+1
-      FieldName(NbField)=TRIM(ADJUSTL(name))
+      name_adj=TRIM(ADJUSTL(name))  ! work around ICE with pgf90
+      FieldName(NbField)=name_adj
       FieldIndex(NbField)=1
       
@@ -1736 +1744 @@
         ELSE IF (Field(ind_b)%ndim==4) THEN
           DO q=1,FieldVarId(NbField)%size
-            status = NF90_DEF_VAR(ncid,TRIM(ADJUSTL(name)//int2str(q)),ncprec,             &
+            status = NF90_DEF_VAR(ncid,name_adj//int2str(q),ncprec,             &
                                   (/ ncellId,dim3id,timeId /),FieldVarId(NbField)%nc_id(q))
             status = NF90_PUT_ATT(ncid,FieldVarId(NbField)%nc_id(q),"coordinates","lon lat")