Changeset 1540


Ignore:
Timestamp:
Apr 13, 2016, 9:57:46 AM (9 years ago)
Author:
emillour
Message:

All GCMS: Further adaptations to keep up with changes in LMDZ5 concerning
physics/dynamics separation:

  • changed directory "dynlonlat_phylonlat" to "dynphy_lonlat" and adapted makelmdz and makelmdz_fcm scripts accordingly.
  • added option "-libphy" to makelmdz_fcm to just build a physics library, without any main program (not operational yet; further cleanup in the physics required).
  • moved "iniprint.h" from dyn3d_common to misc (NB: it is used in both physics and dynamics; this should be cleaned up further...)

EM

Location:
trunk
Files:
4 added
2 deleted
12 edited
5 moved

Legend:

Unmodified
Added
Removed

  • trunk/DOC/chantiers/commit_importants.log

    r1530 r1540  
    16721672  Only partially done for Titan, because of many hard-coded commons; a
    16731673  necessary first step will be to clean these up (using modules).
     1674
     1675**********************
     1676**** commit_v1540 ****
     1677**********************
     1678Ehouarn: Further adaptations to keep up with changes in LMDZ5 concerning
     1679physics/dynamics separation:
     1680- changed directory "dynlonlat_phylonlat" to "dynphy_lonlat" and adapted
     1681  makelmdz and makelmdz_fcm scripts accordingly.
     1682- added option "-libphy" to makelmdz_fcm to just build a physics library,
     1683  without any main program (not operational yet; further cleanup in the
     1684  physics required).
     1685- moved "iniprint.h" from dyn3d_common to misc (NB: it is used in both physics
     1686  and dynamics; this should be cleaned up further...)

  • trunk/LMDZ.COMMON/bld.cfg

    r1521 r1540  
    4242
    4343
    44 bld::outfile_ext::exe    %SUFF_NAME.e
    45 bld::target              liblmdz.a
    46 bld::target              %EXEC%SUFF_NAME.e
     44bld::outfile_ext::exe    %SUFF_NAME
     45bld::target              liblmdz.a %EXEC%SUFF_NAME
    4746bld::exe_dep             
    4847
    4948
    5049dir::root            %CONFIG_PATH
    51 dir::lib             %BASE_CONFIG_PATH
     50#dir::lib             %BASE_CONFIG_PATH
    5251dir::bin             %ROOT_PATH/bin
    5352

  • trunk/LMDZ.COMMON/makelmdz

    r1530 r1540  
    572572   src_dirs="$src_dirs $filtre dyn3d_common dyn3d${FLAG_PARA}"
    573573   if [[ $physique != "nophys" ]] ; then
    574      src_dirs="$src_dirs dynlonlat_phylonlat dynlonlat_phylonlat/phy${phys_root}"
    575      libdyn_phy="-ldynlonlat_phylonlat"
    576      LIBDYN_PHYS='$(LIBO)/libdynlonlat_phylonlat.a'
    577      INCLUDE="$INCLUDE "'-I$(LIBF)/dynlonlat_phylonlat'
    578      INCLUDE="$INCLUDE "'-I$(LIBF)/dynlonlat_phylonlat/'"${phys_root}"
     574     src_dirs="$src_dirs dynphy_lonlat dynphy_lonlat/phy${phys_root}"
     575     libdyn_phy="-ldynphy_lonlat"
     576     LIBDYN_PHYS='$(LIBO)/libdynphy_lonlat.a'
     577     INCLUDE="$INCLUDE "'-I$(LIBF)/dynphy_lonlat'
     578     INCLUDE="$INCLUDE "'-I$(LIBF)/dynphy_lonlat/'"${phys_root}"
    579579   fi
    580580  cd $LIBFGCM/grid
    … …  
    743743        dirmain=phy${physique}
    744744      else
    745         if [[ -r $LMDGCM/libf/dynlonlat_phylonlat/phy$phys_root/${code}.F ]]
     745        if [[ -r $LMDGCM/libf/dynphy_lonlat/phy$phys_root/${code}.F ]]
    746746        then
    747747          source_code=${code}.F
    748           dirmain="dynlonlat_phylonlat/phy${phys_root}"
     748          dirmain="dynphy_lonlat/phy${phys_root}"
    749749        else
    750750          if [[ -r $LMDGCM/libf/phy$physique/dyn1d/${code}.F ]]

  • trunk/LMDZ.COMMON/makelmdz_fcm

    r1530 r1540  
    3636job=1
    3737full=''
     38libphy=false
    3839
    3940LMDGCM=`/bin/pwd`
    … …  
    192193          full="-full" ; shift ;;
    193194
     195      "-libphy")
     196          libphy="true" ; shift ;;
     197
    194198      "-arch")
    195199          arch=$2 ; shift ; shift ;;
    … …  
    264268   PHY_COMMON_PATH="${LIBFGCM}/phy_common"
    265269   # set the dyn/phys interface path
    266    DYN_PHYS_PATH="${LIBFGCM}/dynlonlat_phylonlat"
    267    DYN_PHYS_SUB_PATH="${LIBFGCM}/dynlonlat_phylonlat/phy${phys_root}"
     270   DYN_PHYS_PATH="${LIBFGCM}/dynphy_lonlat"
     271   DYN_PHYS_SUB_PATH="${LIBFGCM}/dynphy_lonlat/phy${phys_root}"
    268272fi
    269273
    … …  
    599603then
    600604  SUFF_NAME=${SUFF_NAME}_inca
     605fi
     606
     607if [[ $libphy == "true" ]]
     608then
     609  # special case where we compile only the physics
     610  DYN=$LMDGCM/.void_dir
     611  DYN_COMMON_PATH=$LMDGCM/.void_dir
     612  FILTRE_PATH=$LMDGCM/.void_dir
     613  DYN_PHYS_PATH=$LMDGCM/.void_dir
     614  DYN_PHYS_SUB_PATH=$LMDGCM/.void_dir
     615  #and there is no main program to generate
     616  code=""
     617  SUFF_NAME=""
     618else
     619  SUFF_NAME=${SUFF_NAME}.e
    601620fi
    602621
    … …  
    652671rm -rf config
    653672ln -s $LIBOGCM/${arch}${SUFF_NAME}/.config config
    654 ln -s $LIBOGCM/${arch}${SUFF_NAME}/.config/tmp tmp_src
     673ln -s $LIBOGCM/${arch}${SUFF_NAME}/.config/ppsrc tmp_src
    655674
    656675

  • trunk/LMDZ.GENERIC/README

    r1538 r1540  
    11851185  mlayer(k)=lay1_soil*alpha_soil**(k-1/2), for k=0,nsoil-1
    11861186
    1187 
    1188 
     1187== 13/04/2016 == EM
     1188- Some code reorganization: "dynlonlat_phylonlat" directory becomes
     1189  "dynphy_lonlat".
     1190- "iniprint.h" moved from "dyn3d" to "misc".
     1191
     1192

  • trunk/LMDZ.GENERIC/makegcm_gfortran

    r1521 r1540  
    88set physique=std
    99set phys="PHYS=$physique"
    10 set include='-I$(LIBF)/grid -I$(LIBF)/misc -I. -I$(LIBF)/dynlonlat_phylonlat'
     10set include='-I$(LIBF)/grid -I$(LIBF)/misc -I. -I$(LIBF)/dynphy_lonlat'
    1111set ntrac = 1
    1212set filtre=filtrez
    … …  
    498498  if ( "$dyntype" == "olddyn" ) then
    499499    set include="$include "'-I$(LIBF)/olddyn3d '
    500     set src_dirs="$src_dirs olddyn3d dynlonlat_phylonlat dynlonlat_phylonlat/phy$physique"
     500    set src_dirs="$src_dirs olddyn3d dynphy_lonlat dynphy_lonlat/phy$physique"
    501501  else
    502502    set include="$include "'-I$(LIBF)/dyn3d '
    503     set src_dirs="$src_dirs dyn3d dynlonlat_phylonlat dynlonlat_phylonlat/phy$physique"
     503    set src_dirs="$src_dirs dyn3d dynphy_lonlat dynphy_lonlat/phy$physique"
    504504  endif
    505   set libdyn_phy="-ldynlonlat_phylonlat"
    506   set LIBDYN_PHYS='$(LIBO)/libdynlonlat_phylonlat.a'
     505  set libdyn_phy="-ldynphy_lonlat"
     506  set LIBDYN_PHYS='$(LIBO)/libdynphy_lonlat.a'
    507507  set dimh=`echo $dim | awk ' { print $1 "." $2 } '`
    508508endif
    … …  
    778778  set source_code=${code}.F90
    779779endif
    780 if ( -f $LMDGCM/libf/dynlonlat_phylonlat/phy${physique}/${code}.F ) then
    781   set dirmain=dynlonlat_phylonlat/phy${physique}
     780if ( -f $LMDGCM/libf/dynphy_lonlat/phy${physique}/${code}.F ) then
     781  set dirmain=dynphy_lonlat/phy${physique}
    782782  set source_code=${code}.F
    783783endif
    784 if ( -f $LMDGCM/libf/dynlonlat_phylonlat/phy${physique}/${code}.F90 ) then
    785   set dirmain=dynlonlat_phylonlat/phy${physique}
     784if ( -f $LMDGCM/libf/dynphy_lonlat/phy${physique}/${code}.F90 ) then
     785  set dirmain=dynphy_lonlat/phy${physique}
    786786  set source_code=${code}.F90
    787787endif

  • trunk/LMDZ.GENERIC/makegcm_ifort

    r1521 r1540  
    88set physique=std
    99set phys="PHYS=$physique"
    10 set include='-I$(LIBF)/grid -I$(LIBF)/misc -I. -I$(LIBF)/dynlonlat_phylonlat'
     10set include='-I$(LIBF)/grid -I$(LIBF)/misc -I. -I$(LIBF)/dynphy_lonlat'
    1111set ntrac = 1
    1212set filtre=filtrez
    … …  
    501501  if ( "$dyntype" == "olddyn" ) then
    502502    set include="$include "'-I$(LIBF)/olddyn3d '
    503     set src_dirs="$src_dirs olddyn3d dynlonlat_phylonlat dynlonlat_phylonlat/phy$physique"
     503    set src_dirs="$src_dirs olddyn3d dynphy_lonlat dynphy_lonlat/phy$physique"
    504504  else
    505505    set include="$include "'-I$(LIBF)/dyn3d '
    506     set src_dirs="$src_dirs dyn3d dynlonlat_phylonlat dynlonlat_phylonlat/phy$physique"
     506    set src_dirs="$src_dirs dyn3d dynphy_lonlat dynphy_lonlat/phy$physique"
    507507  endif
    508   set libdyn_phy="-ldynlonlat_phylonlat"
    509   set LIBDYN_PHYS='$(LIBO)/libdynlonlat_phylonlat.a'
     508  set libdyn_phy="-ldynphy_lonlat"
     509  set LIBDYN_PHYS='$(LIBO)/libdynphy_lonlat.a'
    510510  set dimh=`echo $dim | awk ' { print $1 "." $2 } '`
    511511endif
    … …  
    775775  set source_code=${code}.F90
    776776endif
    777 if ( -f $LMDGCM/libf/dynlonlat_phylonlat/phy${physique}/${code}.F ) then
    778   set dirmain=dynlonlat_phylonlat/phy${physique}
     777if ( -f $LMDGCM/libf/dynphy_lonlat/phy${physique}/${code}.F ) then
     778  set dirmain=dynphy_lonlat/phy${physique}
    779779  set source_code=${code}.F
    780780endif
    781 if ( -f $LMDGCM/libf/dynlonlat_phylonlat/phy${physique}/${code}.F90 ) then
    782   set dirmain=dynlonlat_phylonlat/phy${physique}
     781if ( -f $LMDGCM/libf/dynphy_lonlat/phy${physique}/${code}.F90 ) then
     782  set dirmain=dynphy_lonlat/phy${physique}
    783783  set source_code=${code}.F90
    784784endif

  • trunk/LMDZ.GENERIC/makegcm_pgf90

    r1521 r1540  
    88set physique=std
    99set phys="PHYS=$physique"
    10 set include='-I$(LIBF)/grid -I$(LIBF)/misc -I. -I$(LIBF)/dynlonlat_phylonlat'
     10set include='-I$(LIBF)/grid -I$(LIBF)/misc -I. -I$(LIBF)/dynphy_lonlat'
    1111set ntrac = 1
    1212set filtre=filtrez
    … …  
    497497  if ( "$dyntype" == "olddyn" ) then
    498498    set include="$include "'-I$(LIBF)/olddyn3d '
    499     set src_dirs="$src_dirs olddyn3d dynlonlat_phylonlat dynlonlat_phylonlat/phy$physique"
     499    set src_dirs="$src_dirs olddyn3d dynphy_lonlat dynphy_lonlat/phy$physique"
    500500  else
    501501    set include="$include "'-I$(LIBF)/dyn3d '
    502     set src_dirs="$src_dirs dyn3d dynlonlat_phylonlat dynlonlat_phylonlat/phy$physique"
     502    set src_dirs="$src_dirs dyn3d dynphy_lonlat dynphy_lonlat/phy$physique"
    503503  endif
    504   set libdyn_phy="-ldynlonlat_phylonlat"
    505   set LIBDYN_PHYS='$(LIBO)/libdynlonlat_phylonlat.a'
     504  set libdyn_phy="-ldynphy_lonlat"
     505  set LIBDYN_PHYS='$(LIBO)/libdynphy_lonlat.a'
    506506  set dimh=`echo $dim | awk ' { print $1 "." $2 } '`
    507507endif
    … …  
    773773  set source_code=${code}.F90
    774774endif
    775 if ( -f $LMDGCM/libf/dynlonlat_phylonlat/phy${physique}/${code}.F ) then
    776   set dirmain=dynlonlat_phylonlat/phy${physique}
     775if ( -f $LMDGCM/libf/dynphy_lonlat/phy${physique}/${code}.F ) then
     776  set dirmain=dynphy_lonlat/phy${physique}
    777777  set source_code=${code}.F
    778778endif
    779 if ( -f $LMDGCM/libf/dynlonlat_phylonlat/phy${physique}/${code}.F90 ) then
    780   set dirmain=dynlonlat_phylonlat/phy${physique}
     779if ( -f $LMDGCM/libf/dynphy_lonlat/phy${physique}/${code}.F90 ) then
     780  set dirmain=dynphy_lonlat/phy${physique}
    781781  set source_code=${code}.F90
    782782endif

  • trunk/LMDZ.MARS/README

    r1535 r1540  
    22512251== 08/04/2016 == EM
    22522252- Fix for the 1D model initializations.
     2253
     2254== 13/04/2016 == EM
     2255- Some code reorganization: "dynlonlat_phylonlat" directory becomes
     2256  "dynphy_lonlat".
     2257- "iniprint.h" moved from "dyn3d" to "misc".

  • trunk/LMDZ.MARS/makegcm_gfortran

    r1521 r1540  
    88set physique=mars
    99set phys="PHYS=$physique"
    10 set include='-I$(LIBF)/grid -I$(LIBF)/misc -I. -I$(LIBF)/dynlonlat_phylonlat'
     10set include='-I$(LIBF)/grid -I$(LIBF)/misc -I. -I$(LIBF)/dynphy_lonlat'
    1111set cpp_def=''
    1212set ntrac = 1
    … …  
    503503  if ( "$dyntype" == "olddyn" ) then
    504504    set include="$include "'-I$(LIBF)/olddyn3d '
    505     set src_dirs="$src_dirs olddyn3d dynlonlat_phylonlat dynlonlat_phylonlat/phy$physique"
     505    set src_dirs="$src_dirs olddyn3d dynphy_lonlat dynphy_lonlat/phy$physique"
    506506  else
    507507    set include="$include "'-I$(LIBF)/dyn3d '
    508     set src_dirs="$src_dirs dyn3d dynlonlat_phylonlat dynlonlat_phylonlat/phy$physique"
     508    set src_dirs="$src_dirs dyn3d dynphy_lonlat dynphy_lonlat/phy$physique"
    509509  endif
    510   set libdyn_phy="-ldynlonlat_phylonlat"
    511   set LIBDYN_PHYS='$(LIBO)/libdynlonlat_phylonlat.a'
     510  set libdyn_phy="-ldynphy_lonlat"
     511  set LIBDYN_PHYS='$(LIBO)/libdynphy_lonlat.a'
    512512  set dimh=`echo $dim | awk ' { print $1 "." $2 } '`
    513513endif
    … …  
    763763cd $localdir
    764764
    765 ## locate main program (could be in dyn3d or dynlonlat_phylonlat/phy$physique
     765## locate main program (could be in dyn3d or dynphy_lonlat/phy$physique
    766766##  or phy$physique/dyn1d   and could be .F or .F90)
    767767set source_code=${code}.F
    … …  
    778778  set source_code=${code}.F90
    779779endif
    780 if ( -f $LMDGCM/libf/dynlonlat_phylonlat/phy${physique}/${code}.F ) then
    781   set dirmain=dynlonlat_phylonlat/phy${physique}
     780if ( -f $LMDGCM/libf/dynphy_lonlat/phy${physique}/${code}.F ) then
     781  set dirmain=dynphy_lonlat/phy${physique}
    782782  set source_code=${code}.F
    783783endif
    784 if ( -f $LMDGCM/libf/dynlonlat_phylonlat/phy${physique}/${code}.F90 ) then
    785   set dirmain=dynlonlat_phylonlat/phy${physique}
     784if ( -f $LMDGCM/libf/dynphy_lonlat/phy${physique}/${code}.F90 ) then
     785  set dirmain=dynphy_lonlat/phy${physique}
    786786  set source_code=${code}.F90
    787787endif

  • trunk/LMDZ.MARS/makegcm_ifort

    r1521 r1540  
    88set physique=mars
    99set phys="PHYS=$physique"
    10 set include='-I$(LIBF)/grid -I$(LIBF)/misc -I. -I$(LIBF)/dynlonlat_phylonlat'
     10set include='-I$(LIBF)/grid -I$(LIBF)/misc -I. -I$(LIBF)/dynphy_lonlat'
    1111set cpp_def=''
    1212set ntrac = 1
    … …  
    534534  if ( "$dyntype" == "olddyn" ) then
    535535    set include="$include "'-I$(LIBF)/olddyn3d '
    536     set src_dirs="$src_dirs olddyn3d dynlonlat_phylonlat dynlonlat_phylonlat/phy$physique"
     536    set src_dirs="$src_dirs olddyn3d dynphy_lonlat dynphy_lonlat/phy$physique"
    537537  else
    538538    set include="$include "'-I$(LIBF)/dyn3d '
    539     set src_dirs="$src_dirs dyn3d dynlonlat_phylonlat dynlonlat_phylonlat/phy$physique"
     539    set src_dirs="$src_dirs dyn3d dynphy_lonlat dynphy_lonlat/phy$physique"
    540540  endif
    541   set libdyn_phy="-ldynlonlat_phylonlat"
    542   set LIBDYN_PHYS='$(LIBO)/libdynlonlat_phylonlat.a'
     541  set libdyn_phy="-ldynphy_lonlat"
     542  set LIBDYN_PHYS='$(LIBO)/libdynphy_lonlat.a'
    543543  set dimh=`echo $dim | awk ' { print $1 "." $2 } '`
    544544endif
    … …  
    793793cd $localdir
    794794
    795 ## locate main program (could be in dyn3d or dynlonlat_phylonlat/phy$physique
     795## locate main program (could be in dyn3d or dynphy_lonlat/phy$physique
    796796##  or phy$physique/dyn1d   and could be .F or .F90)
    797797set source_code=${code}.F
    … …  
    808808  set source_code=${code}.F90
    809809endif
    810 if ( -f $LMDGCM/libf/dynlonlat_phylonlat/phy${physique}/${code}.F ) then
    811   set dirmain=dynlonlat_phylonlat/phy${physique}
     810if ( -f $LMDGCM/libf/dynphy_lonlat/phy${physique}/${code}.F ) then
     811  set dirmain=dynphy_lonlat/phy${physique}
    812812  set source_code=${code}.F
    813813endif
    814 if ( -f $LMDGCM/libf/dynlonlat_phylonlat/phy${physique}/${code}.F90 ) then
    815   set dirmain=dynlonlat_phylonlat/phy${physique}
     814if ( -f $LMDGCM/libf/dynphy_lonlat/phy${physique}/${code}.F90 ) then
     815  set dirmain=dynphy_lonlat/phy${physique}
    816816  set source_code=${code}.F90
    817817endif

  • trunk/LMDZ.MARS/makegcm_pgf

    r1521 r1540  
    88set physique=mars
    99set phys="PHYS=$physique"
    10 set include='-I$(LIBF)/grid -I$(LIBF)/misc -I. -I$(LIBF)/dynlonlat_phylonlat'
     10set include='-I$(LIBF)/grid -I$(LIBF)/misc -I. -I$(LIBF)/dynphy_lonlat'
    1111set cpp_def=''
    1212set ntrac = 1
    … …  
    507507  if ( "$dyntype" == "olddyn" ) then
    508508    set include="$include "'-I$(LIBF)/olddyn3d '
    509     set src_dirs="$src_dirs olddyn3d dynlonlat_phylonlat dynlonlat_phylonlat/phy$physique"
     509    set src_dirs="$src_dirs olddyn3d dynphy_lonlat dynphy_lonlat/phy$physique"
    510510  else
    511511    set include="$include "'-I$(LIBF)/dyn3d '
    512     set src_dirs="$src_dirs dyn3d dynlonlat_phylonlat dynlonlat_phylonlat/phy$physique"
     512    set src_dirs="$src_dirs dyn3d dynphy_lonlat dynphy_lonlat/phy$physique"
    513513  endif
    514   set libdyn_phy="-ldynlonlat_phylonlat"
    515   set LIBDYN_PHYS='$(LIBO)/libdynlonlat_phylonlat.a'
     514  set libdyn_phy="-ldynphy_lonlat"
     515  set LIBDYN_PHYS='$(LIBO)/libdynphy_lonlat.a'
    516516  set dimh=`echo $dim | awk ' { print $1 "." $2 } '`
    517517endif
    … …  
    764764cd $localdir
    765765
    766 ## locate main program (could be in dyn3d or dynlonlat_phylonlat/phy$physique
     766## locate main program (could be in dyn3d or dynphy_lonlat/phy$physique
    767767##  or phy$physique/dyn1d   and could be .F or .F90)
    768768set source_code=${code}.F
    … …  
    779779  set source_code=${code}.F90
    780780endif
    781 if ( -f $LMDGCM/libf/dynlonlat_phylonlat/phy${physique}/${code}.F ) then
    782   set dirmain=dynlonlat_phylonlat/phy${physique}
     781if ( -f $LMDGCM/libf/dynphy_lonlat/phy${physique}/${code}.F ) then
     782  set dirmain=dynphy_lonlat/phy${physique}
    783783  set source_code=${code}.F
    784784endif
    785 if ( -f $LMDGCM/libf/dynlonlat_phylonlat/phy${physique}/${code}.F90 ) then
    786   set dirmain=dynlonlat_phylonlat/phy${physique}
     785if ( -f $LMDGCM/libf/dynphy_lonlat/phy${physique}/${code}.F90 ) then
     786  set dirmain=dynphy_lonlat/phy${physique}
    787787  set source_code=${code}.F90
    788788endif
Note: See TracChangeset for help on using the changeset viewer.