Changeset 2239 for LMDZ5/trunk/libf/phylmd

Timestamp:

Mar 23, 2015, 8:27:30 AM (9 years ago)

Author:

Ehouarn Millour

Message:

Reorganizing physics/dynamics interface:

• what is related to dynamics-physics interface is now in a seperate directory: dynlmdz_phy* for physics in phy*
• 1d model and related dependencies (including a couple from "dynamics", set up as symbolic links) is now in subdirectory "dyn1d" of phy*.
• "bibio" directory is now "misc" and should only contain autonomous utilities.
• "cosp" is now a subdirectory of phylmd.

EM

Location:

LMDZ5/trunk/libf/phylmd

Files:

• cosp (moved) (moved from LMDZ5/trunk/libf/cosp)
• dyn1d (added)
• dyn1d/1DUTILS.h (moved) (moved from LMDZ5/trunk/libf/phylmd/1DUTILS.h) (4 diffs)
• dyn1d/1D_decl_cases.h (moved) (moved from LMDZ5/trunk/libf/phylmd/1D_decl_cases.h)
• dyn1d/1D_interp_cases.h (moved) (moved from LMDZ5/trunk/libf/phylmd/1D_interp_cases.h)
• dyn1d/1D_nudge_sandu_astex.h (moved) (moved from LMDZ5/trunk/libf/phylmd/1D_nudge_sandu_astex.h)
• dyn1d/1D_read_forc_cases.h (moved) (moved from LMDZ5/trunk/libf/phylmd/1D_read_forc_cases.h)
• dyn1d/1Dconv.h (moved) (moved from LMDZ5/trunk/libf/phylmd/1Dconv.h)
• dyn1d/comconst.h (added)
• dyn1d/comdissnew.h (added)
• dyn1d/comgeom.h (added)
• dyn1d/comgeom2.h (added)
• dyn1d/comvert.h (added)
• dyn1d/conf_gcm.F90 (added)
• dyn1d/control_mod.F90 (added)
• dyn1d/disvert.F90 (added)
• dyn1d/ener.h (added)
• dyn1d/exner_hyb_m.F90 (added)
• dyn1d/infotrac.F90 (added)
• dyn1d/iniphysiq.F90 (added)
• dyn1d/lmdz1d.F90 (moved) (moved from LMDZ5/trunk/libf/phylmd/lmdz1d.F90) (2 diffs)
• dyn1d/logic.h (added)
• dyn1d/mod_const_mpi.F90 (added)
• dyn1d/mod_grid_phy_lmdz.F90 (added)
• dyn1d/mod_phys_lmdz_mpi_data.F90 (added)
• dyn1d/mod_phys_lmdz_mpi_transfert.F90 (added)
• dyn1d/mod_phys_lmdz_omp_data.F90 (added)
• dyn1d/mod_phys_lmdz_omp_transfert.F90 (added)
• dyn1d/mod_phys_lmdz_para.F90 (added)
• dyn1d/mod_phys_lmdz_transfert_para.F90 (added)
• dyn1d/paramet.h (added)
• dyn1d/q_sat.F (added)
• dyn1d/serre.h (added)
• dyn1d/temps.h (added)
• dyn1d/tracstoke.h (added)
• dyn1d/write_field.F90 (added)
• etat0_netcdf.F90 (modified) (2 diffs)
• init_phys_lmdz.F90 (modified) (1 diff)
• iotd.h (copied) (copied from LMDZ5/trunk/libf/bibio/iotd.h)
• iotd_ecrit.F90 (copied) (copied from LMDZ5/trunk/libf/bibio/iotd_ecrit.F90)
• iotd_fin.F90 (copied) (copied from LMDZ5/trunk/libf/bibio/iotd_fin.F90)
• iotd_ini.F90 (copied) (copied from LMDZ5/trunk/libf/bibio/iotd_ini.F90)
• limit_netcdf.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/dyn1d/1DUTILS.h

@@ -1 @@
-#include "../dyn3d/conf_gcm.F90"
-#include "../dyn3d_common/q_sat.F"
+#include "conf_gcm.F90"
+#include "q_sat.F"
 
 !
@@ -443 +443 @@
 !   Declarations:
 !   -------------
-#include "dimensions.h"
-#include "comconst.h"
-#include "temps.h"
+      include "dimensions.h"
+      include "comconst.h"
+      include "temps.h"
 !!#include "control.h"
-#include "logic.h"
-#include "netcdf.inc"
+      include "logic.h"
+      include "netcdf.inc"
 
 !   Arguments:
@@ -587 +587 @@
 !   Declarations:
 !   -------------
-#include "dimensions.h"
-#include "comconst.h"
-#include "temps.h"
+      include "dimensions.h"
+      include "comconst.h"
+      include "temps.h"
 !!#include "control.h"
-#include "logic.h"
-#include "netcdf.inc"
+      include "logic.h"
+      include "netcdf.inc"
 
 !   Arguments:
@@ -894 +894 @@
       IMPLICIT NONE
  
-#include "dimensions.h"
-#include "paramet.h"
+      include "dimensions.h"
+      include "paramet.h"
 !
 !=======================================================================

LMDZ5/trunk/libf/phylmd/dyn1d/lmdz1d.F90

@@ -1 @@
-#ifdef CPP_1D
-#include "../dyn3d/mod_const_mpi.F90"
-#include "../dyn3d_common/control_mod.F90"
-#include "../dyn3d_common/infotrac.F90"
-#include "../dyn3d_common/disvert.F90"
+!#ifdef CPP_1D
+!#include "../dyn3d/mod_const_mpi.F90"
+!#include "../dyn3d_common/control_mod.F90"
+!#include "../dyn3d_common/infotrac.F90"
+!#include "../dyn3d_common/disvert.F90"
 
 
@@ -1052 +1052 @@
 #include "1Dconv.h"
 
-#endif
-
+!#endif
+

LMDZ5/trunk/libf/phylmd/etat0_netcdf.F90

@@ -5 +5 @@
 !
 SUBROUTINE etat0_netcdf(ib, masque, phis, letat0)
+#ifndef CPP_1D
 !
 !-------------------------------------------------------------------------------
@@ -535 +536 @@
 !#endif of #ifdef CPP_EARTH
   RETURN
-
+#endif
+!#endif of ifndef CPP_1D
 END SUBROUTINE etat0_netcdf
 !

LMDZ5/trunk/libf/phylmd/init_phys_lmdz.F90

@@ -3 +3 @@
 !
 SUBROUTINE Init_Phys_lmdz(iim,jjp1,llm,nb_proc,distrib)
-  USE mod_phys_lmdz_para
-  USE mod_grid_phy_lmdz
+  USE mod_phys_lmdz_para, ONLY: Init_phys_lmdz_para, klon_omp
+  USE mod_grid_phy_lmdz, ONLY: Init_grid_phy_lmdz, nbp_lev
   USE dimphy, ONLY : Init_dimphy
   USE infotrac, ONLY : type_trac

LMDZ5/trunk/libf/phylmd/limit_netcdf.F90

@@ -4 +4 @@
 !
 SUBROUTINE limit_netcdf(interbar, extrap, oldice, masque)
+#ifndef CPP_1D
 !
 !-------------------------------------------------------------------------------
@@ -660 +661 @@
 ! of #ifdef CPP_EARTH
 
+#endif
+! of #ifndef CPP_1D
 END SUBROUTINE limit_netcdf