Ignore:
Timestamp:
Nov 5, 2018, 3:24:59 PM (6 years ago)
Author:
Laurent Fairhead
Message:

Undoing merge with trunk (r3356) to properly register Yann's latest modifications

Location:
LMDZ6/branches/DYNAMICO-conv
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/branches/DYNAMICO-conv

  • LMDZ6/branches/DYNAMICO-conv/libf/phylmd/iostart.F90

    r3356 r3411  
    8989    LOGICAL,INTENT(OUT),OPTIONAL   :: found
    9090
    91     CALL Get_field_rgen(field_name,field,1,found)
     91    IF (PRESENT(found)) THEN
     92      CALL Get_field_rgen(field_name,field,1,found)
     93    ELSE
     94      CALL Get_field_rgen(field_name,field,1)
     95    ENDIF
    9296     
    9397  END SUBROUTINE Get_Field_r1
     
    99103    LOGICAL,INTENT(OUT),OPTIONAL   :: found
    100104
    101     CALL Get_field_rgen(field_name,field,size(field,2),found)
     105    IF (PRESENT(found)) THEN
     106      CALL Get_field_rgen(field_name,field,size(field,2),found)
     107    ELSE
     108      CALL Get_field_rgen(field_name,field,size(field,2))
     109    ENDIF
    102110
    103111     
     
    110118    LOGICAL,INTENT(OUT),OPTIONAL   :: found
    111119
    112     CALL Get_field_rgen(field_name,field,size(field,2)*size(field,3),found)
     120    IF (PRESENT(found)) THEN
     121      CALL Get_field_rgen(field_name,field,size(field,2)*size(field,3),found)
     122    ELSE
     123      CALL Get_field_rgen(field_name,field,size(field,2)*size(field,3))
     124    ENDIF
    113125     
    114126  END SUBROUTINE Get_Field_r3
     
    207219    REAL                         :: varout(1)
    208220   
    209     CALL Get_var_rgen(var_name,varout,size(varout),found)
     221    IF (PRESENT(found)) THEN
     222      CALL Get_var_rgen(var_name,varout,size(varout),found)
     223    ELSE
     224      CALL Get_var_rgen(var_name,varout,size(varout))
     225    ENDIF
    210226    var=varout(1)
    211227 
     
    218234    LOGICAL,OPTIONAL,INTENT(OUT) :: found
    219235   
    220     CALL Get_var_rgen(var_name,var,size(var),found)
     236    IF (PRESENT(found)) THEN
     237      CALL Get_var_rgen(var_name,var,size(var),found)
     238    ELSE
     239      CALL Get_var_rgen(var_name,var,size(var))
     240    ENDIF
    221241 
    222242  END SUBROUTINE get_var_r1
     
    228248    LOGICAL,OPTIONAL,INTENT(OUT) :: found
    229249   
    230     CALL Get_var_rgen(var_name,var,size(var),found)
     250    IF (PRESENT(found)) THEN
     251      CALL Get_var_rgen(var_name,var,size(var),found)
     252    ELSE
     253      CALL Get_var_rgen(var_name,var,size(var))
     254    ENDIF
    231255 
    232256  END SUBROUTINE get_var_r2
     
    238262    LOGICAL,OPTIONAL,INTENT(OUT) :: found
    239263   
    240     CALL Get_var_rgen(var_name,var,size(var),found)
     264    IF (PRESENT(found)) THEN
     265      CALL Get_var_rgen(var_name,var,size(var),found)
     266    ELSE
     267      CALL Get_var_rgen(var_name,var,size(var))
     268    ENDIF
    241269 
    242270  END SUBROUTINE get_var_r3
Note: See TracChangeset for help on using the changeset viewer.