Changeset 2352

Timestamp:

Aug 26, 2015, 8:08:40 AM (9 years ago)

Author:

Ehouarn Millour

Message:

Fix a circular dependency introduced in previous commit: occurs when routines in phy_common use module print_control. Make them 'include "iniprint.h"' instead (not an ideal solution but will have to do for now), and therfore move iniprint.h to "misc" directory.
EM

Location:

LMDZ5/trunk/libf

Files:

• misc/iniprint.h (moved) (moved from LMDZ5/trunk/libf/dyn3d_common/iniprint.h)
• phy_common/ioipsl_getin_p_mod.F90 (modified) (1 diff)
• phy_common/mod_phys_lmdz_mpi_data.F90 (modified) (1 diff)
• phylmd/dyn1d/iniprint.h (deleted)

LMDZ5/trunk/libf/phy_common/ioipsl_getin_p_mod.F90

@@ -12 +12 @@
 USE mod_phys_lmdz_mpi_data, ONLY :  is_mpi_root
 USE mod_phys_lmdz_omp_data, ONLY :  is_omp_root
-use mod_phys_lmdz_para, only : bcast
+USE mod_phys_lmdz_transfert_para, ONLY : bcast
 !-
 IMPLICIT NONE

LMDZ5/trunk/libf/phy_common/mod_phys_lmdz_mpi_data.F90

@@ -187 +187 @@
 
   SUBROUTINE print_module_data
-  USE print_control_mod, ONLY: lunout
+!  USE print_control_mod, ONLY: lunout
   IMPLICIT NONE
-!  INCLUDE "iniprint.h" 
+  INCLUDE "iniprint.h" 
   
     WRITE(lunout,*) 'ii_begin =', ii_begin