Changeset 2239 for LMDZ5/trunk/create_make_gcm

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:

• LMDZ5/trunk/create_make_gcm (modified) (4 diffs)

LMDZ5/trunk/create_make_gcm

@@ -50 +50 @@
 fi
 echo "LOCAL_DIR=`echo $localdir`"
-echo 'BIBIO    = $(LIBF)/bibio'
+echo 'MISC    = $(LIBF)/misc'
 echo "FILTRE   = filtre"
 echo "PHYS  = "
 echo 'LIBPHY = $(LIBO)/libphy$(PHYS).a'
+echo 'LIBDYN_PHY = $(LIBO)/libdynlmdz_phy$(PHYS).a'
 echo 'DIRMAIN=dyn$(DIM)d$(FLAG_PARA)'
 echo 'RM=rm'
@@ -62 +63 @@
 echo 'L_DYN      = -ldyn$(DIM)d$(FLAG_PARA) -ldyn3d_common'
 echo 'L_FILTRE   = -l$(FILTRE)'
+echo 'L_DYN_PHY = -ldynlmdz_phy$(PHYS) '
 echo 'L_PHY = -lphy$(PHYS) '
-echo 'L_BIBIO    = -lbibio'
+echo 'L_MISC    = -lmisc'
 echo 'L_ADJNT    ='
 echo 'L_COSP     = -lcosp'
@@ -89 +91 @@
 echo 'DYN  = dyn$(DIM)d'
 echo
-#echo 'main : chimie $(DYN) bibio phys $(OPTION_DEP) '
-echo 'main : $(DYN) bibio phys $(OPTION_DEP) '
+#echo 'main : chimie $(DYN) misc phys $(OPTION_DEP) '
+echo 'main : $(DYN) misc phys dyn_phy $(OPTION_DEP) '
 echo '  cd $(LIBO) ; $(RANLIB) lib*.a ; cd $(GCM) ;\'
 echo '  cd $(LOCAL_DIR); \'
 echo '  $(COMPILE90) $(LIBF)/$(DIRMAIN)/$(SOURCE) -o $(PROG).o ; \'
-echo '  $(LINK) $(PROG).o -L$(LIBO) $(L_DYN) $(L_ADJNT) $(L_COSP) $(L_PHY) $(L_DYN) $(L_DYN3D_COMMON) $(L_BIBIO) $(L_DYN3D_COMMON) $(L_PHY) $(L_DYN) $(L_FILTRE) $(OPLINK) $(OPTION_LINK) -o $(LOCAL_DIR)/$(PROG).e ; $(RM) $(PROG).o '
+echo '  $(LINK) $(PROG).o -L$(LIBO) $(L_DYN) $(L_DYN_PHY) $(L_ADJNT) $(L_COSP) $(L_PHY) $(L_DYN) $(L_DYN3D_COMMON) $(L_MISC) $(L_DYN3D_COMMON) $(L_PHY) $(L_DYN_PHY) $(L_DYN) $(L_FILTRE) $(OPLINK) $(OPTION_LINK) -o $(LOCAL_DIR)/$(PROG).e ; $(RM) $(PROG).o '
 echo
 echo 'phys : $(LIBPHY)'
@@ -101 +103 @@
 echo 'dyn1d :'
 echo
+echo 'dyn_phy: $(LIBDYN_PHYS)'
 echo
 #echo 'chimie : $(LIBO)/libchimie.a'
 echo
-echo 'bibio : $(LIBO)/libbibio.a'
+echo 'misc : $(LIBO)/libmisc.a'
 echo
 echo 'adjnt : $(LIBO)/libadjnt.a'