Changeset 3411 for LMDZ6/branches/DYNAMICO-conv/makelmdz

Timestamp:

Nov 5, 2018, 3:24:59 PM (7 years ago)

Author:

Laurent Fairhead

Message:

Undoing merge with trunk (r3356) to properly register Yann's latest modifications

Location:

LMDZ6/branches/DYNAMICO-conv

Files:

• . (modified) (1 prop)
• makelmdz (modified) (7 diffs)

LMDZ6/branches/DYNAMICO-conv/makelmdz

@@ -75 +75 @@
   fi
 fi
-#COSP_PATH=$LMDGCM/.void_dir
+COSP_PATH=$LMDGCM/.void_dir
 
 
@@ -311 +311 @@
 
 # get ar command from arch.fcm file
-archfileline=$( grep -i '^%AR ' arch.fcm )
+archfileline=$( grep -i '^%AR' arch.fcm )
 arcommand=$( echo ${archfileline##%AR} )
-
-# get ar command options from arch.fcm file
-archfileline=$( grep -i '^%ARFLAGS' arch.fcm )
-arflags=$( echo ${archfileline##%ARFLAGS} )
 
 # get make utility from arch.fcm file
@@ -464 +460 @@
    CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS"
    INCLUDE="$INCLUDE -I${IOIPSL_INCDIR} -I${XIOS_INCDIR}"
-   LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios -l${LIBPREFIX}stdc++"
+   LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios"
 elif [[ $io == xios ]]
 then
@@ -470 +466 @@
    CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS CPP_IOIPSL_NO_OUTPUT"
    INCLUDE="$INCLUDE -I${IOIPSL_INCDIR} -I${XIOS_INCDIR}"
-   LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios -l${LIBPREFIX}stdc++"
+   LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios"
 fi
 
@@ -476 +472 @@
 then
    CPP_KEY="$CPP_KEY CPP_COSP"
-#   COSP_PATH="$LIBFGCM/phylmd/cosp"
-   src_dirs="$src_dirs phy${physique}/cosp"
+   COSP_PATH="$LIBFGCM/phylmd/cosp"
+   src_dirs="$src_dirs cosp"
 #   LIB="${LIB} -l${LIBPREFIX}cosp"
-#  opt_dep="$opt_dep cosp"
-#  lcosp="-l${LIBPREFIX}cosp"
-   INCLUDE="$INCLUDE"' -I$(LIBF)/'phy${physique}'/cosp'
+   opt_dep="$opt_dep cosp"
+   lcosp="-l${LIBPREFIX}cosp"
+   INCLUDE="$INCLUDE"' -I$(LIBF)/cosp'
 fi
 
@@ -768 +764 @@
 MOD_SUFFIX="mod" \
 AR=$arcommand \
-ARFLAGS="$arflags" \
 DIRMAIN=$dirmain \
 SOURCE=$source_code \
@@ -801 +796 @@
 MOD_SUFFIX="mod" \
 AR=$arcommand \
-ARFLAGS="$arflags" \
 DIRMAIN=$dirmain \
 SOURCE=$source_code \