Changeset 1521 for trunk/LMDZ.GENERIC

Timestamp:

Mar 25, 2016, 10:34:35 AM (9 years ago)

Author:

emillour

Message:

All GCMs: Updates to make planetary codes (+Earth) setups converge.

• Made a "phy_common" directory in libf, to contain routines common (wrt structural nature of underlying code/grid) to all LMDZ-related physics packages.
• moved all "mod_phys_*" and "mod_grid_phy_lmdz" files from dynlonlat_phylonlat to "phy_common"
• moved "ioipsl_getincom_p.F90 from "misc" to "phy_common" and modified it to match Earth GCM version and renamed it ioipsl_getin_p_mod.F90
• added an "abort_physics" (as in Earth GCM) in "phy_common"
• added a "print_control_mod.F90 (as in Earth GCM) in phy_common
• made similar changes in LMDZ.GENERIC and LMDZ.MARS

EM

Location:

trunk/LMDZ.GENERIC

Files:

• README (modified) (1 diff)
• create_make_gcm (modified) (3 diffs)
• libf/phy_common (added)
• libf/phy_common/ioipsl_getin_p_mod.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/misc/ioipsl_getincom_p.F90) (2 diffs)
• libf/phy_common/mod_grid_phy_lmdz.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/mod_grid_phy_lmdz.F90)
• libf/phy_common/mod_phys_lmdz_mpi_data.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/mod_phys_lmdz_mpi_data.F90)
• libf/phy_common/mod_phys_lmdz_mpi_transfert.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/mod_phys_lmdz_mpi_transfert.F90)
• libf/phy_common/mod_phys_lmdz_omp_data.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/mod_phys_lmdz_omp_data.F90)
• libf/phy_common/mod_phys_lmdz_omp_transfert.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/mod_phys_lmdz_omp_transfert.F90)
• libf/phy_common/mod_phys_lmdz_para.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/mod_phys_lmdz_para.F90)
• libf/phy_common/mod_phys_lmdz_transfert_para.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/mod_phys_lmdz_transfert_para.F90)
• libf/phystd/callcorrk.F90 (modified) (1 diff)
• libf/phystd/dyn1d/mod_grid_phy_lmdz.F90 (deleted)
• libf/phystd/dyn1d/mod_phys_lmdz_mpi_data.F90 (deleted)
• libf/phystd/dyn1d/mod_phys_lmdz_mpi_transfert.F90 (deleted)
• libf/phystd/dyn1d/mod_phys_lmdz_omp_data.F90 (deleted)
• libf/phystd/dyn1d/mod_phys_lmdz_omp_transfert.F90 (deleted)
• libf/phystd/dyn1d/mod_phys_lmdz_para.F90 (deleted)
• libf/phystd/dyn1d/mod_phys_lmdz_transfert_para.F90 (deleted)
• libf/phystd/hydrol.F90 (modified) (1 diff)
• libf/phystd/inifis.F (modified) (1 diff)
• libf/phystd/largescale.F90 (modified) (1 diff)
• libf/phystd/radii_mod.F90 (modified) (1 diff)
• libf/phystd/rain.F90 (modified) (1 diff)
• libf/phystd/sugas_corrk.F90 (modified) (1 diff)
• makegcm_g95 (deleted)
• makegcm_gfortran (modified) (4 diffs)
• makegcm_ifort (modified) (3 diffs)
• makegcm_pgf90 (modified) (4 diffs)

trunk/LMDZ.GENERIC/README

@@ -1126 +1126 @@
   this of course includes all module variables, as "threadprivate").
 
+== 25/03/2016 == EM
+- Code reorganization (to mach comming evolutions on all planetary models),
+  created a "phy_common" directory to contain routines common (wrt structural
+  nature of underlying code/grid) to all LMDZ-related physics packages.
+- Moved ioipsl_getincom_p.F90 from "misc" to "phy_common" and modified it
+  to match Earth GCM version and renamed it ioipsl_getin_p_mod.F90
+- Adapted calls from phystd/* routines accordingly
+- Adapted "create_make_gcm" and "makegcm*" scripts accordingly
+  (deleted obsolete makegcm_g95)

trunk/LMDZ.GENERIC/create_make_gcm

@@ -74 +74 @@
 echo 'L_FILTRE   = -l$(FILTRE)'
 echo 'L_DYN_PHY = -ldynlmdz_phy$(PHYS) '
-echo 'L_PHY = -lphy$(PHYS) '
+echo 'L_PHY = -lphy$(PHYS) -lphy_common'
 echo 'L_MISC    = -lmisc'
 #echo 'L_AERONOMARS    = -laeronomars'
@@ -100 +100 @@
 echo 'DYN  = dyn$(DIM)d'
 echo
-echo 'main : $(DYN) misc phys dyn_phy $(OPTION_DEP) '
+echo 'main : $(DYN) misc phys phy_common dyn_phy $(OPTION_DEP) '
 echo '  cd $(LIBO) ; $(RANLIB) lib*.a ; cd $(GCM) ;\'
 echo '  cd $(LOCAL_DIR); \'
 echo '  $(COMPILE90) $(LIBF)/$(DIRMAIN)/$(SOURCE) -o $(PROG).o ; \'
-if [ "$CRAY" = '0' ] ; then
 echo '  $(LINK) $(PROG).o -L$(LIBO) $(L_DYN) $(L_DYN_PHY) $(L_ADJNT) $(L_FILTRE) $(L_PHY) $(L_DYN_PHY) $(L_MISC) $(L_DYN) $(L_PHY) $(OPLINK) $(OPTION_LINK) -o $(LOCAL_DIR)/$(PROG).e ; $(RM) $(PROG).o '
-else
-echo '  $(LINK) $(PROG).o -L$(LIBO) $(L_DYN) $(L_DYN_PHY) $(L_ADJNT) $(L_FILTRE) $(L_PHY) $(L_DYN_PHY) $(L_MISC) $(L_DYN) $(L_PHY) $(OPLINK) $(OPTION_LINK) -o $(LOCAL_DIR)/$(PROG).e ; $(RM) $(PROG).o '
-fi
 echo
 echo 'dyn : $(LIBO)/libdyn$(DIM)d.a $(FILTRE)$(DIM)d'
@@ -115 +111 @@
 echo
 echo 'phys : $(LIBPHY)'
+echo 'phy_common : $(LIBPHY_COMMON)'
 echo
 echo 'dyn3d : $(LIBO)/libdyn3d.a $(LIBO)/lib$(FILTRE).a'

trunk/LMDZ.GENERIC/libf/phy_common/ioipsl_getin_p_mod.F90

@@ -2 +2 @@
 ! $Id$
 !
-! Module/Routines extracted from IOIPSL v2_1_8
-!
-MODULE ioipsl_getincom_p
-!-
-!$Id: getincom.f90 536 2009-01-30 11:46:27Z bellier $
-!-
-! This software is governed by the CeCILL license
-! See IOIPSL/IOIPSL_License_CeCILL.txt
+MODULE ioipsl_getin_p_mod
+! To use getin in a parallel context
 !---------------------------------------------------------------------
-USE ioipsl_getincom ! to use  'getin'
+#ifdef CPP_IOIPSL
+USE ioipsl, ONLY: getin
+#else
+USE ioipsl_getincom, ONLY: getin
+#endif
 USE mod_phys_lmdz_mpi_data, ONLY :  is_mpi_root
 USE mod_phys_lmdz_omp_data, ONLY :  is_omp_root
@@ -168 +166 @@
 !-----------------------------
 
-END MODULE ioipsl_getincom_p
+END MODULE ioipsl_getin_p_mod
+

trunk/LMDZ.GENERIC/libf/phystd/callcorrk.F90

@@ -13 +13 @@
       use watercommon_h
       use datafile_mod, only: datadir
-      use ioipsl_getincom_p
+      use ioipsl_getin_p_mod, only: getin_p
       use gases_h
       use radii_mod, only : su_aer_radii,co2_reffrad,h2o_reffrad,dust_reffrad,h2so4_reffrad,back2lay_reffrad

trunk/LMDZ.GENERIC/libf/phystd/hydrol.F90

@@ -6 +6 @@
      pctsrf_sic,sea_ice)
 
-!  use ioipsl_getincom 
-  use ioipsl_getincom_p
+  use ioipsl_getin_p_mod, only: getin_p
   use watercommon_h, only: T_h2O_ice_liq, RLFTT, rhowater, mx_eau_sol
   USE surfdat_h

trunk/LMDZ.GENERIC/libf/phystd/inifis.F

@@ -52 +52 @@
 !   -------------
       use datafile_mod, only: datadir
-      USE ioipsl_getincom_p, only: getin_p
+      use ioipsl_getin_p_mod, only: getin_p
       IMPLICIT NONE
 

trunk/LMDZ.GENERIC/libf/phystd/largescale.F90

@@ -3 +3 @@
 
 
-!     to use  'getin'
-!      use ioipsl_getincom 
-      use ioipsl_getincom_p
+      use ioipsl_getin_p_mod, only: getin_p
       use watercommon_h, only : RLVTT, RCPD, RVTMP2,  &
           T_h2O_ice_clouds,T_h2O_ice_liq,Psat_waterDP,Lcpdqsat_waterDP

trunk/LMDZ.GENERIC/libf/phystd/radii_mod.F90

@@ -36 +36 @@
 !
 !==================================================================
- ! to use  'getin'
-!      use ioipsl_getincom 
-      use ioipsl_getincom_p
+      use ioipsl_getin_p_mod, only: getin_p
       use radinc_h, only: naerkind
       use aerosol_mod

trunk/LMDZ.GENERIC/libf/phystd/rain.F90

@@ -2 +2 @@
 
 
-! to use  'getin'
-!  use ioipsl_getincom 
-  use ioipsl_getincom_p
+  use ioipsl_getin_p_mod, only: getin_p
   use watercommon_h, only: T_h2O_ice_liq,T_h2O_ice_clouds, RLVTT, RCPD, RCPV, RV, RVTMP2,Psat_water,Tsat_water,rhowater
   use radii_mod, only: h2o_cloudrad

trunk/LMDZ.GENERIC/libf/phystd/sugas_corrk.F90

@@ -28 +28 @@
       use comcstfi_mod, only: mugaz
       use gases_h
-!      use ioipsl_getincom
-      use ioipsl_getincom_p 
+      use ioipsl_getin_p_mod, only: getin_p
       use callkeys_mod, only: varactive,varfixed,graybody,callgasvis,&
                 continuum,H2Ocont_simple

trunk/LMDZ.GENERIC/makegcm_gfortran

@@ -34 +34 @@
 setenv NCDFINC /donnees/emlmd/netcdf64-4.0.1_gfortran/include
 #####
-
-
-
+# Adapt example below to your personal machine (here "antolini"), if necessary
+if (`hostname -s` == "antolini" ) then
+  setenv NCDFLIB /home/MILLOUR/netcdf64-4.0.1_gfortran/lib
+  setenv NCDFINC /home/MILLOUR/netcdf64-4.0.1_gfortran/include
+endif
 
 setenv localdir "`pwd`"
@@ -409 +411 @@
    set phys="L_PHY= LIBPHY="
 else
-   set src_dirs="$src_dirs phy$physique"
-   set include="$include "' -I$(LIBF)/phy'"$physique"
+   set src_dirs="$src_dirs phy_common phy$physique"
+   set include="$include "'-I$(LIBF)/phy_common  -I$(LIBF)/phy'"$physique"
+   set LIBPHY_COMMON='$(LIBO)/libphy_common.a'
 endif
 set libdyn_phy=""
@@ -793 +796 @@
 LIBO=$libo \
 $phys \
+LIBPHY_COMMON=${LIBPHY_COMMON} \
 LIBDYN_PHYS=${LIBDYN_PHYS} \
 DIM=$dimc \
@@ -821 +825 @@
 LIBO=$libo \
 $phys \
+LIBPHY_COMMON=${LIBPHY_COMMON} \
 LIBDYN_PHYS=${LIBDYN_PHYS} \
 DIM=$dimc \

trunk/LMDZ.GENERIC/makegcm_ifort

@@ -414 +414 @@
    set phys="L_PHY= LIBPHY="
 else
-   set src_dirs="$src_dirs phy$physique"
-   set include="$include "' -I$(LIBF)/phy'"$physique"
+   set src_dirs="$src_dirs phy_common phy$physique"
+   set include="$include "'-I$(LIBF)/phy_common  -I$(LIBF)/phy'"$physique"
+   set LIBPHY_COMMON='$(LIBO)/libphy_common.a'
 endif
 set libdyn_phy=""
@@ -792 +793 @@
 LIBO=$libo \
 $phys \
+LIBPHY_COMMON=${LIBPHY_COMMON} \
 LIBDYN_PHYS=${LIBDYN_PHYS} \
 DIM=$dimc \
@@ -820 +822 @@
 LIBO=$libo \
 $phys \
+LIBPHY_COMMON=${LIBPHY_COMMON} \
 LIBDYN_PHYS=${LIBDYN_PHYS} \
 DIM=$dimc \

trunk/LMDZ.GENERIC/makegcm_pgf90

@@ -34 +34 @@
 setenv NCDFINC /donnees/emlmd/netcdf64-4.0.1_pgi/include
 ####
+# Adapt example below to your personal machine (here "antolini"), if necessary
+if (`hostname -s` == "antolini" ) then
+  setenv NCDFLIB /home/MILLOUR/netcdf64-4.0.1_pgi/lib
+  setenv NCDFINC /home/MILLOUR/netcdf64-4.0.1_pgi/include
+endif
 
 setenv localdir "`pwd`"
@@ -405 +410 @@
    set phys="L_PHY= LIBPHY="
 else
-   set src_dirs="$src_dirs phy$physique"
-   set include="$include "' -I$(LIBF)/phy'"$physique"
+   set src_dirs="$src_dirs phy_common phy$physique"
+   set include="$include "'-I$(LIBF)/phy_common  -I$(LIBF)/phy'"$physique"
+   set LIBPHY_COMMON='$(LIBO)/libphy_common.a'
 endif
 set libdyn_phy=""
@@ -785 +791 @@
 LIBO=$libo \
 $phys \
+LIBPHY_COMMON=${LIBPHY_COMMON} \
 LIBDYN_PHYS=${LIBDYN_PHYS} \
 DIM=$dimc \
@@ -813 +820 @@
 LIBO=$libo \
 $phys \
+LIBPHY_COMMON=${LIBPHY_COMMON} \
 LIBDYN_PHYS=${LIBDYN_PHYS} \
 DIM=$dimc \