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

Timestamp:

Jun 29, 2018, 12:31:11 PM (6 years ago)

Author:

Laurent Fairhead

Message:

First attempt at merging with trunk

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
@@ -460 +464 @@
    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"
+   LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios -l${LIBPREFIX}stdc++"
 elif [[ $io == xios ]]
 then
@@ -466 +470 @@
    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"
+   LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios -l${LIBPREFIX}stdc++"
 fi
 
@@ -472 +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
 
@@ -764 +768 @@
 MOD_SUFFIX="mod" \
 AR=$arcommand \
+ARFLAGS="$arflags" \
 DIRMAIN=$dirmain \
 SOURCE=$source_code \
@@ -796 +801 @@
 MOD_SUFFIX="mod" \
 AR=$arcommand \
+ARFLAGS="$arflags" \
 DIRMAIN=$dirmain \
 SOURCE=$source_code \