Changeset 2016 for LMDZ5/trunk/makelmdz

Timestamp:

Apr 16, 2014, 1:39:42 AM (11 years ago)

Author:

fhourdin

Message:

Modification de create_make_gcm et makelmdz pour la compilation 1D.

File:

• LMDZ5/trunk/makelmdz (modified) (7 diffs)

LMDZ5/trunk/makelmdz

@@ -84 +84 @@
 
 CPP_KEY="" 
-INCLUDE='-I$(LIBF)/grid -I$(LIBF)/bibio -I$(LIBF)/dyn3d_common -I$(LIBF)/filtrez -I. '
+INCLUDE='-I$(LIBF)/grid -I$(LIBF)/bibio -I$(LIBF)/filtrez -I. '
 LIB=""
 adjnt=""
@@ -167 +167 @@
           CPP_KEY="$CPP_KEY $2" ; shift ; shift ;;
 
-      "-adjnt")
-          echo "not operational ... work to be done here ";exit
-          opt_dep="$opt_dep adjnt" ; adjnt="-ladjnt -ldyn3d "
-          optim="$optim -Dadj" ; shift ;;
-
       "-cosp")
           cosp="$2" ; shift ; shift ;;
@@ -487 +482 @@
    cp -p fxy_${grille}.h fxyprim.h
    filtre="FILTRE=$filtre"
-   INCLUDE="$INCLUDE "'-I$(LIBF)/dyn3d${FLAG_PARA} '
+   INCLUDE="$INCLUDE "'-I$(LIBF)/dyn3d${FLAG_PARA} -I$(LIBF)/dyn3d_common '
 elif (( $dimc == 2 )) ; then
    filtre="FILTRE= L_FILTRE= "
@@ -493 +488 @@
 elif (( $dimc == 1 )) ; then
    filtre="L_DYN= DYN= FILTRE= L_FILTRE= DIRMAIN=phy$physique "
-   INCLUDE="$INCLUDE "'-I$(LIBF)/dyn3d' # Pas tres propre
+   INCLUDE="$INCLUDE "'-I$(LIBF)/dyn3d -I$(LIBF)/dyn3d_common ' # Pas tres propre
 else
    echo Dimension dimc=$dimc pas prevu ; exit
@@ -508 +503 @@
 then
   SUFF_NAME=${SUFF_NAME}_para
-  DYN=dyn${dimc}d${paramem}
+  DYN="dyn${dimc}d${paramem} dyn3d_common"
   if [[ "$paramem" == "mem" ]]
   then
@@ -515 +510 @@
 else
   SUFF_NAME=${SUFF_NAME}_seq
-  DYN=dyn${dimc}d
+  DYN="dyn${dimc}d dyn3d_common"
 fi
 
@@ -574 +569 @@
 if [[ -r $LMDGCM/libf/dyn${dimc}d${FLAG_PARA}/${code}.F90 ]]
 then
+  source_code=${code}.F90
+elif [[ -r $LMDGCM/libf/phy$physique/${code}.F90 ]] ; then
   source_code=${code}.F90
 fi