Changeset 3232

Timestamp:

Feb 27, 2018, 10:18:32 AM (6 years ago)

Author:

fhourdin

Message:

Modifications pour compiler avec makelmdz et cosp

Location:

LMDZ6/trunk

Files:

• create_make_gcm (modified) (3 diffs)
• makelmdz (modified) (2 diffs)

LMDZ6/trunk/create_make_gcm

@@ -68 +68 @@
 echo 'L_MISC    = -lmisc'
 echo 'L_ADJNT    ='
-echo 'L_COSP     = -lcosp'
 
 echo
@@ -98 +97 @@
 echo '  cd $(LOCAL_DIR); \'
 echo '  $(COMPILE90) $(LIBF)/$(DIRMAIN)/$(SOURCE) -o $(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 '  $(LINK) $(PROG).o -L$(LIBO) $(L_DYN) $(L_DYN_PHY) $(L_ADJNT) $(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)'
@@ -113 +112 @@
 echo
 echo 'adjnt : $(LIBO)/libadjnt.a'
-echo
-echo 'cosp : $(LIBO)/libcosp.a'
 echo
 echo '$(FILTRE)3d : $(LIBO)/lib$(FILTRE).a'

LMDZ6/trunk/makelmdz

@@ -75 +75 @@
   fi
 fi
-COSP_PATH=$LMDGCM/.void_dir
+#COSP_PATH=$LMDGCM/.void_dir
 
 
@@ -476 +476 @@
 then
    CPP_KEY="$CPP_KEY CPP_COSP"
-   COSP_PATH="$LIBFGCM/phylmd/cosp"
-   src_dirs="$src_dirs cosp"
+#   COSP_PATH="$LIBFGCM/phylmd/cosp"
+   src_dirs="$src_dirs phy${physique}/cosp"
 #   LIB="${LIB} -l${LIBPREFIX}cosp"
-   opt_dep="$opt_dep cosp"
-   lcosp="-l${LIBPREFIX}cosp"
-   INCLUDE="$INCLUDE"' -I$(LIBF)/cosp'
+#  opt_dep="$opt_dep cosp"
+#  lcosp="-l${LIBPREFIX}cosp"
+   INCLUDE="$INCLUDE"' -I$(LIBF)/'phy${physique}'/cosp'
 fi