Changeset 13099


Ignore:
Timestamp:
2020-06-12T12:56:41+02:00 (3 months ago)
Author:
jcastill
Message:

Changes to allow the use of a later OASIS and xios 2.0 version

Location:
branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

    r7470 r13099  
    13261326      IF ( xios_is_valid_gridgroup(cdid) )   CALL xios_set_gridgroup_attr( cdid, mask=mask ) 
    13271327#else 
    1328       IF ( xios_is_valid_grid     (cdid) )   CALL xios_set_grid_attr     ( cdid, mask3=mask ) 
    1329       IF ( xios_is_valid_gridgroup(cdid) )   CALL xios_set_gridgroup_attr( cdid, mask3=mask ) 
     1328      IF ( xios_is_valid_grid     (cdid) )   CALL xios_set_grid_attr     ( cdid, mask_3D=mask ) 
     1329      IF ( xios_is_valid_gridgroup(cdid) )   CALL xios_set_gridgroup_attr( cdid, mask_3D=mask ) 
    13301330#endif 
    13311331      CALL xios_solve_inheritance() 
  • branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

    r7471 r13099  
    231231                  IF( ln_ctl ) WRITE(numout,*) "Define", ji, jc, jm, " "//TRIM(zclname), " for ", OASIS_Out 
    232232                  CALL oasis_def_var (ssnd(ji)%nid(jc,jm), zclname, id_part   , (/ 2, 0 /),   & 
    233                      &                OASIS_Out          , ishape , OASIS_REAL, nerror ) 
     233                     &                OASIS_Out          , RESHAPE(ishape, (/4/)) , OASIS_REAL, nerror ) 
    234234                  IF ( nerror /= OASIS_Ok ) THEN 
    235235                     WRITE(numout,*) 'Failed to define transient ', ji, jc, jm, " "//TRIM(zclname) 
     
    276276                  IF( ln_ctl ) WRITE(numout,*) "Define", ji, jc, jm, " "//TRIM(zclname), " for ", OASIS_In 
    277277                  CALL oasis_def_var (srcv(ji)%nid(jc,jm), zclname, id_part   , (/ 2, 0 /),   & 
    278                      &                OASIS_In           , ishape , OASIS_REAL, nerror ) 
     278                     &                OASIS_In           , RESHAPE(ishape, (/4/)) , OASIS_REAL, nerror ) 
    279279                  IF ( nerror /= OASIS_Ok ) THEN 
    280280                     WRITE(numout,*) 'Failed to define transient ', ji, jc, jm, " "//TRIM(zclname) 
Note: See TracChangeset for help on using the changeset viewer.