Changeset 2239 for LMDZ5/trunk/makelmdz


Ignore:
Timestamp:
Mar 23, 2015, 8:27:30 AM (10 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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/trunk/makelmdz

    r2238 r2239  
    7777
    7878CPP_KEY=""
    79 INCLUDE='-I$(LIBF)/grid -I$(LIBF)/bibio -I$(LIBF)/filtrez -I. '
     79INCLUDE='-I$(LIBF)/grid -I$(LIBF)/misc -I$(LIBF)/filtrez -I. '
    8080LIB=""
    8181adjnt=""
     
    8585EXT_SRC=""
    8686#src_dirs: directories containing source files
    87 src_dirs="grid bibio"
     87src_dirs="grid misc"
    8888########################################################################
    8989# lecture des options
     
    288288   #We'll use some physics
    289289   src_dirs="$src_dirs phy$physique"
     290   LIBPHY='$(LIBO)/libphy'"$physique"'.a'
     291   lib_phy='-lphy'"$physique"
    290292   CPP_KEY="$CPP_KEY CPP_PHYS"
    291293   if [[ "${physique:0:3}" == "lmd" ]]
     
    417419then
    418420   CPP_KEY="$CPP_KEY CPP_COSP"
    419    COSP_PATH="$LIBFGCM/cosp"
     421   COSP_PATH="$LIBFGCM/phylmd/cosp"
    420422   src_dirs="$src_dirs cosp"
    421423#   LIB="${LIB} -l${LIBPREFIX}cosp"
     
    498500if (( $dimc == 3 )) ; then
    499501   src_dirs="$src_dirs $filtre dyn3d_common dyn3d${FLAG_PARA}"
     502   if [[ $physique != "nophys" ]] ; then
     503     src_dirs="$src_dirs dynlmdz_phy${physique}"
     504     libdyn_phy="-ldynlmdz_phy${physique}"
     505     LIBDYN_PHYS='$(LIBO)/libdynlmdz_phy'"${physique}"'.a'
     506     INCLUDE="$INCLUDE "'-I$(LIBF)/dynlmdz_phy'"${physique}"
     507   fi
    500508   cd $LIBFGCM/grid
    501509   \rm fxyprim.h
     
    504512   INCLUDE="$INCLUDE "'-I$(LIBF)/dyn3d${FLAG_PARA} -I$(LIBF)/dyn3d_common '
    505513elif (( $dimc == 2 )) ; then
     514   src_dirs="$src_dirs dyn2d"
    506515   filtre="FILTRE= L_FILTRE= "
    507516   INCLUDE="$INCLUDE "'-I$(LIBF)/dyn2d'
    508517elif (( $dimc == 1 )) ; then
    509    src_dirs="$src_dirs dyn3d dyn3d_common filtrez"
     518   #src_dirs="$src_dirs dyn3d dyn3d_common filtrez"
     519   src_dirs="$src_dirs phy${physique}/dyn1d"
    510520   CPP_KEY="$CPP_KEY CPP_1D"
    511    filtre="L_DYN= DYN= FILTRE= L_FILTRE= DIRMAIN=phy$physique "
    512    INCLUDE="$INCLUDE "'-I$(LIBF)/dyn3d -I$(LIBF)/dyn3d_common ' # Pas tres propre
     521   filtre="L_DYN= DYN= FILTRE= L_FILTRE= "
     522   #INCLUDE="$INCLUDE "'-I$(LIBF)/dyn3d -I$(LIBF)/dyn3d_common ' # Pas tres propre
     523   INCLUDE="$INCLUDE "' -I$(LIBF)/phy'"$physique"'/dyn1d'
    513524else
    514525   echo Dimension dimc=$dimc pas prevu ; exit
     
    590601
    591602source_code=${code}.F
     603dirmain=dyn${dimc}d${FLAG_PARA}
    592604if [[ -r $LMDGCM/libf/dyn${dimc}d${FLAG_PARA}/${code}.F90 ]]
    593605then
    594606  source_code=${code}.F90
    595607elif [[ -r $LMDGCM/libf/phy$physique/${code}.F90 ]] ; then
     608  dirmain=phy$physique
     609  source_code=${code}.F90
     610elif [[ -r $LMDGCM/libf/dynlmdz_phy$physique/${code}.F90 ]] ; then
     611  dirmain=dynlmdz_phy${physique}
     612  source_code=${code}.F90
     613elif [[ -r $LMDGCM/libf/phy$physique/dyn1d/${code}.F90 ]] ; then
     614  dirmain=phy$physique/dyn1d
    596615  source_code=${code}.F90
    597616fi
     
    647666LIBO=${LIBOGCM}/${nomlib} \
    648667"PHYS=$physique" \
     668LIBPHY=${LIBPHY} \
     669LIBDYN_PHYS=${LIBDYN_PHYS} \
    649670DIM=$dimc \
    650671FLAG_PARA=$FLAG_PARA \
     672L_PHY="$lib_phy" \
     673L_DYN_PHY="$libdyn_phy" \
    651674L_ADJNT=$adjnt \
    652675L_COSP="$lcosp" \
     
    661684MOD_SUFFIX="mod" \
    662685AR=$arcommand \
     686DIRMAIN=$dirmain \
    663687SOURCE=$source_code \
    664688PROG=$code
     
    673697LIBO=${LIBOGCM}/${nomlib} \
    674698"PHYS=$physique" \
     699LIBPHY=${LIBPHY} \
     700LIBDYN_PHYS=${LIBDYN_PHYS} \
    675701DIM=$dimc \
    676702FLAG_PARA=$FLAG_PARA \
     703L_PHY="$lib_phy" \
     704L_DYN_PHY="$libdyn_phy" \
    677705L_ADJNT=$adjnt \
    678706L_COSP="$lcosp" \
     
    687715MOD_SUFFIX="mod" \
    688716AR=$arcommand \
     717DIRMAIN=$dirmain \
    689718SOURCE=$source_code \
    690719PROG=$code
Note: See TracChangeset for help on using the changeset viewer.