Changeset 1540 for trunk/LMDZ.GENERIC


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/LMDZ.GENERIC
Files:
4 edited
1 moved

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.