Changeset 2054


Ignore:
Timestamp:
Jun 3, 2014, 5:07:16 PM (10 years ago)
Author:
acaubel
Message:

Modifications to run LMDZ in coupled mode with both OASIS-MCT and XIOS.

Location:
LMDZ5/trunk/libf
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/trunk/libf/bibio/wxios.F90

    r2002 r2054  
    129129        g_ctx_name = xios_ctx_name
    130130       
    131         CALL wxios_context_init()
    132        
     131#ifndef CPP_COUPLE
     132            CALL wxios_context_init()
     133#endif
     134
    133135    END SUBROUTINE wxios_init
    134136

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

    r1965 r2054  
    2121    USE mod_prism
    2222#endif
     23#ifdef CPP_XIOS
     24    USE wxios, only: wxios_init
     25#endif
    2326    IMPLICIT NONE
    2427#ifdef CPP_MPI
    … …  
    4144#ifdef CPP_COUPLE
    4245!$OMP MASTER
    43        CALL prism_init_comp_proto (comp_id, 'lmdz.x', ierr)
     46#ifdef CPP_XIOS
     47      CALL wxios_init("LMDZ", outcom=COMM_LMDZ)
     48#else
     49       CALL prism_init_comp_proto (comp_id, 'LMDZ', ierr)
    4450       CALL prism_get_localcomm_proto(COMM_LMDZ,ierr)
     51#endif
    4552!$OMP END MASTER
    4653#endif

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

    r1965 r2054  
    422422
    423423      if (type_ocean == 'couple') then
     424#ifdef CPP_XIOS
     425    !Fermeture propre de XIOS
     426      CALL wxios_close()
     427#else
    424428#ifdef CPP_COUPLE
    425429         call prism_terminate_proto(ierr)
    … …  
    428432         endif
    429433#endif
     434#endif
    430435      else
    431436#ifdef CPP_XIOS

  • LMDZ5/trunk/libf/dyn3dpar/mod_const_mpi.F90

    r1965 r2054  
    2121    USE mod_prism
    2222#endif
     23#ifdef CPP_XIOS
     24    USE wxios, only: wxios_init
     25#endif
    2326    IMPLICIT NONE
    2427#ifdef CPP_MPI
    … …  
    4144#ifdef CPP_COUPLE
    4245!$OMP MASTER
    43        CALL prism_init_comp_proto (comp_id, 'lmdz.x', ierr)
     46#ifdef CPP_XIOS
     47      CALL wxios_init("LMDZ", outcom=COMM_LMDZ)
     48#else
     49       CALL prism_init_comp_proto (comp_id, 'LMDZ', ierr)
    4450       CALL prism_get_localcomm_proto(COMM_LMDZ,ierr)
     51#endif
    4552!$OMP END MASTER
    4653#endif

  • LMDZ5/trunk/libf/dyn3dpar/parallel_lmdz.F90

    r1965 r2054  
    255255
    256256      if (type_ocean == 'couple') then
     257#ifdef CPP_XIOS
     258    !Fermeture propre de XIOS
     259      CALL wxios_close()
     260#else
    257261#ifdef CPP_COUPLE
    258262         call prism_terminate_proto(ierr)
    … …  
    261265         endif
    262266#endif
     267#endif
    263268      else
    264269#ifdef CPP_XIOS

  • LMDZ5/trunk/libf/phylmd/oasis.F90

    r1997 r2054  
    9696    USE surface_data, ONLY : version_ocean
    9797    USE carbon_cycle_mod, ONLY : carbon_cycle_cpl
     98#ifdef CPP_XIOS
     99    USE wxios, ONLY : wxios_context_init
     100#endif
     101
    98102
    99103    INCLUDE "dimensions.h"
    … …  
    128132! Define the model name
    129133!
    130     clmodnam = 'lmdz.x'       ! as in $NBMODEL in Cpl/Nam/namcouple.tmp
     134    clmodnam = 'LMDZ'       ! as in $NBMODEL in Cpl/Nam/namcouple.tmp
    131135
    132136
    … …  
    298302    ENDIF
    299303
     304#ifdef CPP_XIOS
     305    CALL wxios_context_init()
     306#endif
     307
    300308!$OMP END MASTER
    301309   

  • LMDZ5/trunk/libf/phylmd/phyetat0.F90

    r2053 r2054  
    10481048  CALL close_startphy
    10491049
    1050   CALL init_iophy_new(rlat, rlon)
    1051 
    10521050  ! Initialize module pbl_surface_mod
    10531051
    … …  
    10601058  ENDIF
    10611059
     1060  CALL init_iophy_new(rlat, rlon)
     1061
    10621062  ! Initilialize module fonte_neige_mod     
    1063 
    10641063  CALL fonte_neige_init(run_off_lic_0)
    10651064
Note: See TracChangeset for help on using the changeset viewer.