Changeset 3438 for LMDZ6/trunk

Timestamp:

Jan 23, 2019, 11:46:38 AM (6 years ago)

Author:

Laurent Fairhead

Message:

Choosing the right ORCHIDEE interface and some XIOS stuff

Location:

LMDZ6/trunk/libf/phylmd

Files:

• rrtm/readaerosolstrato1_rrtm.F90 (modified) (2 diffs)
• rrtm/readaerosolstrato2_rrtm.F90 (modified) (2 diffs)
• surf_land_orchidee_nounstruct_mod.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/phylmd/rrtm/readaerosolstrato1_rrtm.F90

@@ -167 +167 @@
     
     IF (grid_type==unstructured) THEN
+#ifdef CPP_XIOS
       IF (is_omp_master) THEN
         ALLOCATE(tauaerstrat_mpi(klon_mpi,klev))
@@ -175 +176 @@
       ENDIF
       CALL scatter_omp(tauaerstrat_mpi,tau_aer_strat)
+#endif
     ELSE  
       CALL scatter(tauaerstrat_mois_glo,tau_aer_strat)

LMDZ6/trunk/libf/phylmd/rrtm/readaerosolstrato2_rrtm.F90

@@ -282 +282 @@
 
       IF (grid_type==unstructured) THEN
+
+#ifdef CPP_XIOS
 
         IF (is_omp_master) THEN
@@ -308 +310 @@
         CALL scatter_omp(cgaerstrat_mpi,cg_aer_strat)
         CALL scatter_omp(taulwaerstrat_mpi,taulw_aer_strat)
+#endif
       ELSE  
         

LMDZ6/trunk/libf/phylmd/surf_land_orchidee_nounstruct_mod.F90

@@ -1 +1 @@
 !
 MODULE surf_land_orchidee_nounstruct_mod
+#ifndef ORCHIDEE_NOZ0H
 #ifdef ORCHIDEE_NOUNSTRUCT
 !
@@ -678 +679 @@
 !
 #endif
+#endif
 END MODULE surf_land_orchidee_nounstruct_mod