Changeset 2055 for LMDZ5/trunk


Ignore:
Timestamp:
Jun 4, 2014, 2:33:27 PM (10 years ago)
Author:
acaubel
Message:

Modifications in order to run forced configuration with coupled executable
i.e replaced the use of cpp key CPP_PARA by the use of type_ocean flag.

Location:
LMDZ5/trunk/libf
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r2054 r2055  
    9696    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    9797
    98     SUBROUTINE wxios_init(xios_ctx_name, locom, outcom)
     98    SUBROUTINE wxios_init(xios_ctx_name, locom, outcom, type_ocean)
    9999        IMPLICIT NONE
    100100        INCLUDE 'iniprint.h'
    … …  
    103103      INTEGER, INTENT(IN), OPTIONAL :: locom
    104104      INTEGER, INTENT(OUT), OPTIONAL :: outcom
     105      CHARACTER(len=6), INTENT(IN), OPTIONAL :: type_ocean
    105106
    106107   
    … …  
    129130        g_ctx_name = xios_ctx_name
    130131       
    131 #ifndef CPP_COUPLE
     132        ! Si couple alors init fait dans cpl_init
     133        IF (.not. PRESENT(type_ocean)) THEN
    132134            CALL wxios_context_init()
    133 #endif
     135        ENDIF
    134136
    135137    END SUBROUTINE wxios_init

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

    r2054 r2055  
    4545!$OMP MASTER
    4646#ifdef CPP_XIOS
    47       CALL wxios_init("LMDZ", outcom=COMM_LMDZ)
     47      CALL wxios_init("LMDZ", outcom=COMM_LMDZ, type_ocean=type_ocean)
    4848#else
    4949       CALL prism_init_comp_proto (comp_id, 'LMDZ', ierr)

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

    r2054 r2055  
    4545!$OMP MASTER
    4646#ifdef CPP_XIOS
    47       CALL wxios_init("LMDZ", outcom=COMM_LMDZ)
     47      CALL wxios_init("LMDZ", outcom=COMM_LMDZ, type_ocean=type_ocean)
    4848#else
    4949       CALL prism_init_comp_proto (comp_id, 'LMDZ', ierr)
Note: See TracChangeset for help on using the changeset viewer.