Changeset 4848


Ignore:
Timestamp:
Mar 8, 2024, 1:09:51 PM (2 months ago)
Author:
Laurent Fairhead
Message:

Modifications needed for XIOS3

Location:
LMDZ6/trunk/libf
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/trunk/libf/dyn3dmem/mod_const_mpi.F90

    r4641 r4848  
    4343!$OMP MASTER
    4444        IF (using_xios) THEN
    45           CALL wxios_init("LMDZ", outcom=COMM_LMDZ, type_ocean=type_ocean)
     45          CALL prism_init_comp_proto (comp_id, 'LMDZ', ierr)
     46          CALL prism_get_localcomm_proto(COMM_LMDZ,ierr)
     47          CALL wxios_init("LMDZ", locom=COMM_LMDZ, outcom=COMM_LMDZ, type_ocean=type_ocean)
    4648        ELSE
    4749          CALL prism_init_comp_proto (comp_id, 'LMDZ', ierr)

  • LMDZ6/trunk/libf/dyn3dmem/parallel_lmdz.F90

    r4619 r4848  
    415415
    416416      if (type_ocean == 'couple') then
     417#ifdef CPP_COUPLE
    417418        IF (using_xios) THEN
    418419          !Fermeture propre de XIOS
    419420          CALL wxios_close()
     421          CALL prism_terminate_proto(ierr)
     422          IF (ierr .ne. PRISM_Ok) THEN
     423            CALL abort_gcm('Finalize_parallel',' Probleme dans prism_terminate_proto ',1)
     424          ENDIF
    420425        ELSE
    421 #ifdef CPP_COUPLE
    422426           call prism_terminate_proto(ierr)
    423427           IF (ierr .ne. PRISM_Ok) THEN
    424428              call abort_gcm('Finalize_parallel',' Probleme dans prism_terminate_proto ',1)
    425429           endif
     430        ENDIF
     431#else
     432        call abort_gcm('Finalize_parallel','type_ocean = couple but CPP_COUPLE not defined',1)
    426433#endif
    427         ENDIF
    428434      else
    429435        IF (using_xios) THEN

  • LMDZ6/trunk/libf/phylmd/iophy.F90

    r4619 r4848  
    15321532  USE mod_phys_lmdz_para, ONLY: is_master
    15331533  USE print_control_mod, ONLY: prt_level,lunout
     1534  USE phys_output_var_mod, ONLY: vars_defined
     1535
    15341536  IMPLICIT NONE
    15351537
    … …  
    15391541  IF (check_dim .AND. is_master) WRITE(lunout,*)'histwrite0d_xios for ', field_name
    15401542
     1543  IF (vars_defined) THEN
    15411544!$OMP MASTER
    1542   CALL xios_send_field(field_name, field)
     1545    CALL xios_send_field(field_name, field)
    15431546!$OMP END MASTER
     1547  ENDIF
    15441548
    15451549  END SUBROUTINE histwrite0d_xios
Note: See TracChangeset for help on using the changeset viewer.