Changeset 1540 for trunk/LMDZ.COMMON/makelmdz

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

File:

• trunk/LMDZ.COMMON/makelmdz (modified) (2 diffs)

trunk/LMDZ.COMMON/makelmdz

@@ -572 +572 @@
    src_dirs="$src_dirs $filtre dyn3d_common dyn3d${FLAG_PARA}"
    if [[ $physique != "nophys" ]] ; then
-     src_dirs="$src_dirs dynlonlat_phylonlat dynlonlat_phylonlat/phy${phys_root}"
-     libdyn_phy="-ldynlonlat_phylonlat"
-     LIBDYN_PHYS='$(LIBO)/libdynlonlat_phylonlat.a'
-     INCLUDE="$INCLUDE "'-I$(LIBF)/dynlonlat_phylonlat'
-     INCLUDE="$INCLUDE "'-I$(LIBF)/dynlonlat_phylonlat/'"${phys_root}"
+     src_dirs="$src_dirs dynphy_lonlat dynphy_lonlat/phy${phys_root}"
+     libdyn_phy="-ldynphy_lonlat"
+     LIBDYN_PHYS='$(LIBO)/libdynphy_lonlat.a'
+     INCLUDE="$INCLUDE "'-I$(LIBF)/dynphy_lonlat'
+     INCLUDE="$INCLUDE "'-I$(LIBF)/dynphy_lonlat/'"${phys_root}"
    fi
   cd $LIBFGCM/grid
@@ -743 +743 @@
         dirmain=phy${physique}
       else
-        if [[ -r $LMDGCM/libf/dynlonlat_phylonlat/phy$phys_root/${code}.F ]] 
+        if [[ -r $LMDGCM/libf/dynphy_lonlat/phy$phys_root/${code}.F ]] 
         then
           source_code=${code}.F
-          dirmain="dynlonlat_phylonlat/phy${phys_root}"
+          dirmain="dynphy_lonlat/phy${phys_root}"
         else
           if [[ -r $LMDGCM/libf/phy$physique/dyn1d/${code}.F ]]