Changeset 1403 for trunk/LMDZ.GENERIC/libf/phystd/dyn1d

Timestamp:

Mar 31, 2015, 3:49:07 PM (10 years ago)

Author:

emillour

Message:

All models: Reorganizing the physics/dynamics interface.

• makelmdz and makelmdz_fcm scripts adapted to handle the new directory settings

• misc: (replaces what was the "bibio" directory)
• Should only contain extremely generic (and non physics or dynamics-specific) routines
• Therefore moved initdynav.F90, initfluxsto.F, inithist.F, writedynav.F90, write_field.F90, writehist.F to "dyn3d_common"

• dynlonlat_phylonlat: (new interface directory)
• This directory contains routines relevent to physics/dynamics grid interactions, e.g. routines gr_dyn_fi or gr_fi_dyn and calfis
• Moreover the dynlonlat_phylonlat contains directories "phy*" corresponding to each physics package "phy*" to be used. These subdirectories should only contain specific interfaces (e.g. iniphysiq) or main programs (e.g. newstart)

• phy*/dyn1d: this subdirectory contains the 1D model using physics from phy*

EM

Location:

trunk/LMDZ.GENERIC/libf/phystd/dyn1d

Files:

• . (added)
• abort_gcm.F (added)
• calcenergy_kcm.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/phystd/calcenergy_kcm.F90)
• comconst.h (added)
• comgeom.h (added)
• comvert.h (added)
• control_mod.F90 (added)
• disvert.F (added)
• diverg.F (added)
• ener.h (added)
• gr_dyn_fi.F (added)
• gr_fi_dyn.F (added)
• gr_u_scal.F (added)
• gr_v_scal.F (added)
• grad.F (added)
• gradients_kcm.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/phystd/gradients_kcm.F90)
• infotrac.F90 (added)
• kcm1d.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/phystd/kcm1d.F90) (1 diff)
• kcmprof_fn.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/phystd/kcmprof_fn.F90)
• logic.h (added)
• mod_const_mpi.F90 (added)
• mod_grid_phy_lmdz.F90 (added)
• mod_phys_lmdz_mpi_data.F90 (added)
• mod_phys_lmdz_mpi_transfert.F90 (added)
• mod_phys_lmdz_omp_data.F90 (added)
• mod_phys_lmdz_omp_transfert.F90 (added)
• mod_phys_lmdz_para.F90 (added)
• mod_phys_lmdz_transfert_para.F90 (added)
• paramet.h (added)
• phasechange_kcm.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/phystd/phasechange_kcm.F90)
• rcm1d.F (moved) (moved from trunk/LMDZ.GENERIC/libf/phystd/rcm1d.F) (1 diff)
• serre.h (added)
• temps.h (added)

trunk/LMDZ.GENERIC/libf/phystd/dyn1d/kcm1d.F90

@@ -8 +8 @@
   use comsaison_h, only: mu0, fract, dist_star
   use planete_mod
+  use callkeys_mod, only: check_cpp_match, pceil, tstrat, tracer
 !  use control_mod
   use comcstfi_mod

trunk/LMDZ.GENERIC/libf/phystd/dyn1d/rcm1d.F

@@ -911 +911 @@
 c     necessaire a la compilation de rcm1d en 1D
 
-      subroutine gr_fi_dyn
-      RETURN
-      END
+!      subroutine gr_fi_dyn
+!      RETURN
+!      END
  
 c***********************************************************************
 c***********************************************************************
 
-#include "../dyn3d/disvert.F"
-#include "../dyn3d/abort_gcm.F"
-#include "../dyn3d/diverg.F"
-#include "../dyn3d/grad.F"
-#include "../dyn3d/gr_u_scal.F"
-#include "../dyn3d/gr_v_scal.F"
-#include "../dyn3d/gr_dyn_fi.F"
-
+!#include "../dyn3d/disvert.F"
+!#include "../dyn3d/abort_gcm.F"
+!#include "../dyn3d/diverg.F"
+!#include "../dyn3d/grad.F"
+!#include "../dyn3d/gr_u_scal.F"
+!#include "../dyn3d/gr_v_scal.F"
+!#include "../dyn3d/gr_dyn_fi.F"
+