Changeset 1521


Ignore:
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
Files:
5 added
23 deleted
22 edited
23 moved

Legend:

Unmodified
Added
Removed

  • trunk/DOC/chantiers/commit_importants.log

    r1508 r1521  
    16031603- and no isotopes-relates changes in dyn3dpar (since these changes
    16041604  have been made in LMDZ5 dyn3dmem).
     1605
     1606**********************
     1607**** commit_v1521 ****
     1608**********************
     1609Ehouarn: Updates to make planetary codes (+Earth) setups converge.
     1610* Made a "phy_common" directory in libf, to contain routines common (wrt
     1611  structural nature of underlying code/grid) to all LMDZ-related physics
     1612  packages.
     1613* moved all "mod_phys_*" and "mod_grid_phy_lmdz" files from dynlonlat_phylonlat
     1614  to "phy_common"
     1615* moved "ioipsl_getincom_p.F90 from "misc" to "phy_common" and modified
     1616  it to match Earth GCM version and renamed it ioipsl_getin_p_mod.F90
     1617* added an "abort_physics" (as in Earth GCM) in "phy_common"
     1618* added a "print_control_mod.F90 (as in Earth GCM) in phy_common
     1619* made similar changes in LMDZ.GENERIC and LMDZ.MARS

  • trunk/LMDZ.COMMON/bld.cfg

    r1406 r1521  
    3434src::misc   %SRC_PATH/misc
    3535src::dyn3d_common   %DYN_COMMON
     36src::phy_common %PHY_COMMON
    3637src::cosp    %COSP
    3738src::chem    %CHEM

  • trunk/LMDZ.COMMON/create_make_gcm

    r1403 r1521  
    6565echo 'L_FILTRE   = -l$(FILTRE)'
    6666echo 'L_DYN_PHY = -ldynlmdz_phy$(PHYS) '
    67 echo 'L_PHY = -lphy$(PHYS) '
     67echo 'L_PHY = -lphy$(PHYS) -lphy_common'
    6868echo 'L_MISC    = -lmisc'
    6969echo 'L_ADJNT    ='
    … …  
    101101echo
    102102#echo 'main : chimie $(DYN) bibio phys $(OPTION_DEP) '
    103 echo 'main : $(DYN) misc phys dyn_phy $(OPTION_DEP) '
     103echo 'main : $(DYN) misc phys phy_common dyn_phy $(OPTION_DEP) '
    104104echo '  cd $(LIBO) ; $(RANLIB) lib*.a ; cd $(GCM) ;\'
    105105echo '  cd $(LOCAL_DIR); \'
    … …  
    108108echo
    109109echo 'phys : $(LIBPHY)'
     110echo 'phy_common : $(LIBPHY_COMMON)'
    110111echo 'dyn3d : $(LIBO)/libdyn$(DIM)d$(FLAG_PARA).a $(LIBO)/lib$(FILTRE).a $(LIBO)/libdyn3d_common.a'
    111112echo 'dyn2d : $(LIBO)/libdyn2d.a'

  • trunk/LMDZ.COMMON/libf/phy_common/ioipsl_getin_p_mod.F90

    r1520 r1521  
    22! $Id$
    33!
    4 ! Module/Routines extracted from IOIPSL v2_1_8
    5 !
    6 MODULE ioipsl_getincom_p
    7 !-
    8 !$Id: getincom.f90 536 2009-01-30 11:46:27Z bellier $
    9 !-
    10 ! This software is governed by the CeCILL license
    11 ! See IOIPSL/IOIPSL_License_CeCILL.txt
     4MODULE ioipsl_getin_p_mod
     5! To use getin in a parallel context
    126!---------------------------------------------------------------------
    13 USE ioipsl_getincom ! to use  'getin'
     7#ifdef CPP_IOIPSL
     8USE ioipsl, ONLY: getin
     9#else
     10USE ioipsl_getincom, ONLY: getin
     11#endif
    1412USE mod_phys_lmdz_mpi_data, ONLY :  is_mpi_root
    1513USE mod_phys_lmdz_omp_data, ONLY :  is_omp_root
    … …  
    168166!-----------------------------
    169167
    170 END MODULE ioipsl_getincom_p
     168END MODULE ioipsl_getin_p_mod
     169

  • trunk/LMDZ.COMMON/makelmdz

    r1444 r1521  
    308308then
    309309   #We'll use some physics
    310    src_dirs="$src_dirs phy$physique"
     310   src_dirs="$src_dirs phy_common phy$physique"
    311311   LIBPHY='$(LIBO)/libphy'"$physique"'.a'
    312    lib_phy='-lphy'"$physique"
     312   LIBPHY_COMMON='$(LIBO)/libphy_common.a'
     313   lib_phy='-lphy'"$physique"' -lphy_common'
    313314   CPP_KEY="$CPP_KEY CPP_PHYS"
    314315   if [[ "${phys_root}" == "lmd" ]]
    … …  
    810811"PHYS=$physique" \
    811812LIBPHY=${LIBPHY} \
     813LIBPHY_COMMON=${LIBPHY_COMMON} \
    812814LIBDYN_PHYS=${LIBDYN_PHYS} \
    813815DIM=$dimc \
    … …  
    845847"PHYS=$physique" \
    846848LIBPHY=${LIBPHY} \
     849LIBPHY_COMMON=${LIBPHY_COMMON} \
    847850LIBDYN_PHYS=${LIBDYN_PHYS} \
    848851DIM=$dimc \

  • trunk/LMDZ.COMMON/makelmdz_fcm

    r1441 r1521  
    4545DYN_PHYS_PATH=$LMDGCM/.void_dir
    4646DYN_PHYS_SUB_PATH=$LMDGCM/.void_dir
     47PHY_COMMON_PATH=$LMDGCM/.void_dir
    4748RRTM_PATH=$LMDGCM/.void_dir
    4849SISVAT_PATH=$LMDGCM/.void_dir
    … …  
    260261   CPP_KEY="$CPP_KEY CPP_EARTH"
    261262   fi
     263   # set physics common utilities path
     264   PHY_COMMON_PATH="${LIBFGCM}/phy_common"
    262265   # set the dyn/phys interface path
    263266   DYN_PHYS_PATH="${LIBFGCM}/dynlonlat_phylonlat"
    … …  
    599602echo "%DYN           $DYN"           >> $config_fcm
    600603echo "%DYN_COMMON    $DYN_COMMON_PATH" >> $config_fcm
     604echo "%PHY_COMMON    $PHY_COMMON_PATH" >> $config_fcm
    601605echo "%FILTRE        $FILTRE_PATH"   >> $config_fcm
    602606echo "%PHYS          phy${physique}" >> $config_fcm

  • trunk/LMDZ.GENERIC/README

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

  • trunk/LMDZ.GENERIC/create_make_gcm

    r1403 r1521  
    7474echo 'L_FILTRE   = -l$(FILTRE)'
    7575echo 'L_DYN_PHY = -ldynlmdz_phy$(PHYS) '
    76 echo 'L_PHY = -lphy$(PHYS) '
     76echo 'L_PHY = -lphy$(PHYS) -lphy_common'
    7777echo 'L_MISC    = -lmisc'
    7878#echo 'L_AERONOMARS    = -laeronomars'
    … …  
    100100echo 'DYN  = dyn$(DIM)d'
    101101echo
    102 echo 'main : $(DYN) misc phys dyn_phy $(OPTION_DEP) '
     102echo 'main : $(DYN) misc phys phy_common dyn_phy $(OPTION_DEP) '
    103103echo '  cd $(LIBO) ; $(RANLIB) lib*.a ; cd $(GCM) ;\'
    104104echo '  cd $(LOCAL_DIR); \'
    105105echo '  $(COMPILE90) $(LIBF)/$(DIRMAIN)/$(SOURCE) -o $(PROG).o ; \'
    106 if [ "$CRAY" = '0' ] ; then
    107106echo '  $(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 '
    108 else
    109 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 '
    110 fi
    111107echo
    112108echo 'dyn : $(LIBO)/libdyn$(DIM)d.a $(FILTRE)$(DIM)d'
    … …  
    115111echo
    116112echo 'phys : $(LIBPHY)'
     113echo 'phy_common : $(LIBPHY_COMMON)'
    117114echo
    118115echo 'dyn3d : $(LIBO)/libdyn3d.a $(LIBO)/lib$(FILTRE).a'

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

    r1520 r1521  
    22! $Id$
    33!
    4 ! Module/Routines extracted from IOIPSL v2_1_8
    5 !
    6 MODULE ioipsl_getincom_p
    7 !-
    8 !$Id: getincom.f90 536 2009-01-30 11:46:27Z bellier $
    9 !-
    10 ! This software is governed by the CeCILL license
    11 ! See IOIPSL/IOIPSL_License_CeCILL.txt
     4MODULE ioipsl_getin_p_mod
     5! To use getin in a parallel context
    126!---------------------------------------------------------------------
    13 USE ioipsl_getincom ! to use  'getin'
     7#ifdef CPP_IOIPSL
     8USE ioipsl, ONLY: getin
     9#else
     10USE ioipsl_getincom, ONLY: getin
     11#endif
    1412USE mod_phys_lmdz_mpi_data, ONLY :  is_mpi_root
    1513USE mod_phys_lmdz_omp_data, ONLY :  is_omp_root
    … …  
    168166!-----------------------------
    169167
    170 END MODULE ioipsl_getincom_p
     168END MODULE ioipsl_getin_p_mod
     169

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

    r1498 r1521  
    1313      use watercommon_h
    1414      use datafile_mod, only: datadir
    15       use ioipsl_getincom_p
     15      use ioipsl_getin_p_mod, only: getin_p
    1616      use gases_h
    1717      use radii_mod, only : su_aer_radii,co2_reffrad,h2o_reffrad,dust_reffrad,h2so4_reffrad,back2lay_reffrad

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

    r1484 r1521  
    66     pctsrf_sic,sea_ice)
    77
    8 !  use ioipsl_getincom
    9   use ioipsl_getincom_p
     8  use ioipsl_getin_p_mod, only: getin_p
    109  use watercommon_h, only: T_h2O_ice_liq, RLFTT, rhowater, mx_eau_sol
    1110  USE surfdat_h

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

    r1520 r1521  
    5252!   -------------
    5353      use datafile_mod, only: datadir
    54       USE ioipsl_getincom_p, only: getin_p
     54      use ioipsl_getin_p_mod, only: getin_p
    5555      IMPLICIT NONE
    5656

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

    r1397 r1521  
    33
    44
    5 !     to use  'getin'
    6 !      use ioipsl_getincom
    7       use ioipsl_getincom_p
     5      use ioipsl_getin_p_mod, only: getin_p
    86      use watercommon_h, only : RLVTT, RCPD, RVTMP2,  &
    97          T_h2O_ice_clouds,T_h2O_ice_liq,Psat_waterDP,Lcpdqsat_waterDP

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

    r1397 r1521  
    3636!
    3737!==================================================================
    38  ! to use  'getin'
    39 !      use ioipsl_getincom
    40       use ioipsl_getincom_p
     38      use ioipsl_getin_p_mod, only: getin_p
    4139      use radinc_h, only: naerkind
    4240      use aerosol_mod

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

    r1397 r1521  
    22
    33
    4 ! to use  'getin'
    5 !  use ioipsl_getincom
    6   use ioipsl_getincom_p
     4  use ioipsl_getin_p_mod, only: getin_p
    75  use watercommon_h, only: T_h2O_ice_liq,T_h2O_ice_clouds, RLVTT, RCPD, RCPV, RV, RVTMP2,Psat_water,Tsat_water,rhowater
    86  use radii_mod, only: h2o_cloudrad

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

    r1450 r1521  
    2828      use comcstfi_mod, only: mugaz
    2929      use gases_h
    30 !      use ioipsl_getincom
    31       use ioipsl_getincom_p
     30      use ioipsl_getin_p_mod, only: getin_p
    3231      use callkeys_mod, only: varactive,varfixed,graybody,callgasvis,&
    3332                continuum,H2Ocont_simple

  • trunk/LMDZ.GENERIC/makegcm_gfortran

    r1403 r1521  
    3434setenv NCDFINC /donnees/emlmd/netcdf64-4.0.1_gfortran/include
    3535#####
    36 
    37 
    38 
     36# Adapt example below to your personal machine (here "antolini"), if necessary
     37if (`hostname -s` == "antolini" ) then
     38  setenv NCDFLIB /home/MILLOUR/netcdf64-4.0.1_gfortran/lib
     39  setenv NCDFINC /home/MILLOUR/netcdf64-4.0.1_gfortran/include
     40endif
    3941
    4042setenv localdir "`pwd`"
    … …  
    409411   set phys="L_PHY= LIBPHY="
    410412else
    411    set src_dirs="$src_dirs phy$physique"
    412    set include="$include "' -I$(LIBF)/phy'"$physique"
     413   set src_dirs="$src_dirs phy_common phy$physique"
     414   set include="$include "'-I$(LIBF)/phy_common  -I$(LIBF)/phy'"$physique"
     415   set LIBPHY_COMMON='$(LIBO)/libphy_common.a'
    413416endif
    414417set libdyn_phy=""
    … …  
    793796LIBO=$libo \
    794797$phys \
     798LIBPHY_COMMON=${LIBPHY_COMMON} \
    795799LIBDYN_PHYS=${LIBDYN_PHYS} \
    796800DIM=$dimc \
    … …  
    821825LIBO=$libo \
    822826$phys \
     827LIBPHY_COMMON=${LIBPHY_COMMON} \
    823828LIBDYN_PHYS=${LIBDYN_PHYS} \
    824829DIM=$dimc \

  • trunk/LMDZ.GENERIC/makegcm_ifort

    r1416 r1521  
    414414   set phys="L_PHY= LIBPHY="
    415415else
    416    set src_dirs="$src_dirs phy$physique"
    417    set include="$include "' -I$(LIBF)/phy'"$physique"
     416   set src_dirs="$src_dirs phy_common phy$physique"
     417   set include="$include "'-I$(LIBF)/phy_common  -I$(LIBF)/phy'"$physique"
     418   set LIBPHY_COMMON='$(LIBO)/libphy_common.a'
    418419endif
    419420set libdyn_phy=""
    … …  
    792793LIBO=$libo \
    793794$phys \
     795LIBPHY_COMMON=${LIBPHY_COMMON} \
    794796LIBDYN_PHYS=${LIBDYN_PHYS} \
    795797DIM=$dimc \
    … …  
    820822LIBO=$libo \
    821823$phys \
     824LIBPHY_COMMON=${LIBPHY_COMMON} \
    822825LIBDYN_PHYS=${LIBDYN_PHYS} \
    823826DIM=$dimc \

  • trunk/LMDZ.GENERIC/makegcm_pgf90

    r1403 r1521  
    3434setenv NCDFINC /donnees/emlmd/netcdf64-4.0.1_pgi/include
    3535####
     36# Adapt example below to your personal machine (here "antolini"), if necessary
     37if (`hostname -s` == "antolini" ) then
     38  setenv NCDFLIB /home/MILLOUR/netcdf64-4.0.1_pgi/lib
     39  setenv NCDFINC /home/MILLOUR/netcdf64-4.0.1_pgi/include
     40endif
    3641
    3742setenv localdir "`pwd`"
    … …  
    405410   set phys="L_PHY= LIBPHY="
    406411else
    407    set src_dirs="$src_dirs phy$physique"
    408    set include="$include "' -I$(LIBF)/phy'"$physique"
     412   set src_dirs="$src_dirs phy_common phy$physique"
     413   set include="$include "'-I$(LIBF)/phy_common  -I$(LIBF)/phy'"$physique"
     414   set LIBPHY_COMMON='$(LIBO)/libphy_common.a'
    409415endif
    410416set libdyn_phy=""
    … …  
    785791LIBO=$libo \
    786792$phys \
     793LIBPHY_COMMON=${LIBPHY_COMMON} \
    787794LIBDYN_PHYS=${LIBDYN_PHYS} \
    788795DIM=$dimc \
    … …  
    813820LIBO=$libo \
    814821$phys \
     822LIBPHY_COMMON=${LIBPHY_COMMON} \
    815823LIBDYN_PHYS=${LIBDYN_PHYS} \
    816824DIM=$dimc \

  • trunk/LMDZ.MARS/README

    r1507 r1521  
    22132213  Now works for any (klon,...) field.
    22142214
     2215== 25/03/2016 == EM
     2216- Code reorganization (to mach comming evolutions on all planetary models),
     2217  created a "phy_common" directory to contain routines common (wrt structural
     2218  nature of underlying code/grid) to all LMDZ-related physics packages.
     2219- Adapted "create_make_gcm" and "makegcm*" scripts accordingly
     2220  (deleted obsolete makegcm_g95)

  • trunk/LMDZ.MARS/create_make_gcm

    r1403 r1521  
    7474echo 'L_FILTRE   = -l$(FILTRE)'
    7575echo 'L_DYN_PHY = -ldynlmdz_phy$(PHYS) '
    76 echo 'L_PHY = -lphy$(PHYS) '
     76echo 'L_PHY = -lphy$(PHYS) -lphy_common'
    7777echo 'L_MISC    = -lmisc'
    7878echo 'L_AERONOMARS    = -laeronomars'
    … …  
    100100echo 'DYN  = dyn$(DIM)d'
    101101echo
    102 echo 'main : $(DYN) misc phys dyn_phy aeronomars $(OPTION_DEP) '
     102echo 'main : $(DYN) misc phys phy_common dyn_phy aeronomars $(OPTION_DEP) '
    103103echo '  cd $(LIBO) ; $(RANLIB) lib*.a ; cd $(GCM) ;\'
    104104echo '  cd $(LOCAL_DIR); \'
    105105echo '  $(COMPILE90) $(LIBF)/$(DIRMAIN)/$(SOURCE) -o $(PROG).o ; \'
    106 if [ "$CRAY" = '0' ] ; then
    107 echo '  $(LINK) $(PROG).o -L$(LIBO) $(L_DYN) $(L_DYN_PHY) $(L_ADJNT) $(L_FILTRE) $(L_AERONOMARS) $(L_PHY) $(L_DYN_PHY) $(L_MISC) $(L_DYN) $(L_AERONOMARS) $(OPLINK) $(OPTION_LINK) -o $(LOCAL_DIR)/$(PROG).e ; $(RM) $(PROG).o '
    108 else
    109 echo '  $(LINK) $(PROG).o -L$(LIBO) $(L_DYN) $(L_DYN_PHY) $(L_ADJNT) $(L_FILTRE) $(L_AERONOMARS) $(L_PHY) $(L_DYN_PHY) $(L_MISC) $(L_DYN) $(L_AERONOMARS) $(OPLINK) $(OPTION_LINK) -o $(LOCAL_DIR)/$(PROG).e ; $(RM) $(PROG).o '
    110 fi
     106echo '  $(LINK) $(PROG).o -L$(LIBO) $(L_DYN) $(L_DYN_PHY) $(L_ADJNT) $(L_FILTRE) $(L_AERONOMARS) $(L_PHY) $(L_DYN_PHY) $(L_MISC) $(L_DYN) $(L_AERONOMARS) $(L_PHY) $(OPLINK) $(OPTION_LINK) -o $(LOCAL_DIR)/$(PROG).e ; $(RM) $(PROG).o '
    111107echo
    112108echo 'dyn : $(LIBO)/libdyn$(DIM)d.a $(FILTRE)$(DIM)d'
    … …  
    115111echo
    116112echo 'phys : $(LIBPHY)'
     113echo 'phy_common : $(LIBPHY_COMMON)'
    117114echo
    118115echo 'dyn3d : $(LIBO)/libdyn3d.a $(LIBO)/lib$(FILTRE).a'

  • trunk/LMDZ.MARS/makegcm_gfortran

    r1499 r1521  
    2929# You may set LIBOGCM to something else; otherwise we default to:
    3030setenv LIBOGCM $LMDGCM/libo
    31 ## NetCDF Libraries: what follows is OK for LMD 32 and 64bit Linux Machines
    32 #if ( `uname -m` == "x86_64" ) then
    33 # 64 bit machines
     31## NetCDF Libraries: what follows is OK for LMD 64bit Linux Machines
    3432  setenv NCDFLIB /donnees/emlmd/netcdf64-4.0.1_gfortran/lib
    3533  setenv NCDFINC /donnees/emlmd/netcdf64-4.0.1_gfortran/include
    36 #else
    37 #  setenv NCDFLIB /donnees/emlmd/netcdf-4.0.1_gfortran/lib
    38 #  setenv NCDFINC /donnees/emlmd/netcdf-4.0.1_gfortran/include
    39 #endif
    4034####
     35# Adapt example below to your personal machine (here "antolini"), if necessary
     36if (`hostname -s` == "antolini" ) then
     37  setenv NCDFLIB /home/MILLOUR/netcdf64-4.0.1_gfortran/lib
     38  setenv NCDFINC /home/MILLOUR/netcdf64-4.0.1_gfortran/include
     39endif
    4140
    4241setenv localdir "`pwd`"
    … …  
    413412   set phys="L_PHY= LIBPHY="
    414413else
    415    set src_dirs="$src_dirs aerono$physique phy$physique"
    416    set include="$include "'-I$(LIBF)/aerono'"$physique"' -I$(LIBF)/phy'"$physique"
     414   set src_dirs="$src_dirs phy_common aerono$physique phy$physique"
     415   set include="$include "'-I$(LIBF)/phy_common -I$(LIBF)/aerono'"$physique"' -I$(LIBF)/phy'"$physique"
     416   set LIBPHY_COMMON='$(LIBO)/libphy_common.a'
    417417endif
    418418set libdyn_phy=""
    … …  
    796796LIBO=$libo \
    797797$phys \
     798LIBPHY_COMMON=${LIBPHY_COMMON} \
    798799LIBDYN_PHYS=${LIBDYN_PHYS} \
    799800DIM=$dimc \
    … …  
    824825LIBO=$libo \
    825826$phys \
     827LIBPHY_COMMON=${LIBPHY_COMMON} \
    826828LIBDYN_PHYS=${LIBDYN_PHYS} \
    827829DIM=$dimc \

  • trunk/LMDZ.MARS/makegcm_ifort

    r1499 r1521  
    443443   set phys="L_PHY= LIBPHY="
    444444else
    445    set src_dirs="$src_dirs aerono$physique phy$physique"
    446    set include="$include "'-I$(LIBF)/aerono'"$physique"' -I$(LIBF)/phy'"$physique"
     445   set src_dirs="$src_dirs phy_common aerono$physique phy$physique"
     446   set include="$include "'-I$(LIBF)/phy_common -I$(LIBF)/aerono'"$physique"' -I$(LIBF)/phy'"$physique"
     447   set LIBPHY_COMMON='$(LIBO)/libphy_common.a'
    447448endif
    448449set libdyn_phy=""
    … …  
    825826LIBO=$libo \
    826827$phys \
     828LIBPHY_COMMON=${LIBPHY_COMMON} \
    827829LIBDYN_PHYS=${LIBDYN_PHYS} \
    828830DIM=$dimc \
    … …  
    853855LIBO=$libo \
    854856$phys \
     857LIBPHY_COMMON=${LIBPHY_COMMON} \
    855858LIBDYN_PHYS=${LIBDYN_PHYS} \
    856859DIM=$dimc \

  • trunk/LMDZ.MARS/makegcm_pgf

    r1499 r1521  
    2929# You may set LIBOGCM to something else; otherwise we default to:
    3030setenv LIBOGCM $LMDGCM/libo
    31 ## NetCDF Libraries: what follows is OK for LMD 32 and 64bit Linux Machines
    32 #if ( `uname -m` == "x86_64" ) then
    33 # 64 bit machines
     31## NetCDF Libraries: what follows is OK for LMD 64bit Linux Machines
    3432  setenv NCDFLIB /donnees/emlmd/netcdf64-4.0.1_pgi/lib
    3533  setenv NCDFINC /donnees/emlmd/netcdf64-4.0.1_pgi/include
    36 #else
    37 #  setenv NCDFLIB /donnees/emlmd/netcdf-4.0.1_pgi/lib
    38 #  setenv NCDFINC /donnees/emlmd/netcdf-4.0.1_pgi/include
    39 #endif
    4034####
     35# Adapt example below to your personal machine (here "antolini"), if necessary
     36if (`hostname -s` == "antolini" ) then
     37  setenv NCDFLIB /home/MILLOUR/netcdf64-4.0.1_pgi/lib
     38  setenv NCDFINC /home/MILLOUR/netcdf64-4.0.1_pgi/include
     39endif
    4140
    4241setenv localdir "`pwd`"
    … …  
    417416   set phys="L_PHY= LIBPHY="
    418417else
    419    set src_dirs="$src_dirs aerono$physique phy$physique"
    420    set include="$include "'-I$(LIBF)/aerono'"$physique"' -I$(LIBF)/phy'"$physique"
     418   set src_dirs="$src_dirs phy_common aerono$physique phy$physique"
     419   set include="$include "'-I$(LIBF)/phy_common -I$(LIBF)/aerono'"$physique"' -I$(LIBF)/phy'"$physique"
     420   set LIBPHY_COMMON='$(LIBO)/libphy_common.a'
    421421endif
    422422set libdyn_phy=""
    … …  
    797797LIBO=$libo \
    798798$phys \
     799LIBPHY_COMMON=${LIBPHY_COMMON} \
    799800LIBDYN_PHYS=${LIBDYN_PHYS} \
    800801DIM=$dimc \
    … …  
    825826LIBO=$libo \
    826827$phys \
     828LIBPHY_COMMON=${LIBPHY_COMMON} \
    827829LIBDYN_PHYS=${LIBDYN_PHYS} \
    828830DIM=$dimc \
Note: See TracChangeset for help on using the changeset viewer.