Changeset 2016

Timestamp:

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

Author:

fhourdin

Message:

Modification de create_make_gcm et makelmdz pour la compilation 1D.

Location:

LMDZ5/trunk

Files:

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

LMDZ5/trunk/create_make_gcm

@@ -49 +49 @@
 echo "LOCAL_DIR=`echo $localdir`"
 echo 'BIBIO    = $(LIBF)/bibio'
-echo 'DYN3D_COMMON   = $(LIBF)/dyn3d_common'
 echo "FILTRE   = filtre"
 echo "PHYS  = "
@@ -65 +64 @@
 echo 'dyn2d            = $(LIBO)/libdyn2d.a'
 echo 'dyn1d            = $(LIBO)/libdyn1d.a'
-echo 'L_DYN      = -ldyn$(DIM)d$(FLAG_PARA)'
+echo 'L_DYN      = -ldyn$(DIM)d$(FLAG_PARA) -ldyn3d_common'
 echo 'L_FILTRE   = -l$(FILTRE)'
 echo 'L_PHY = -lphy$(PHYS) '
 echo 'L_BIBIO    = -lbibio'
-echo 'L_DYN3D_COMMON    = -ldyn3d_common'
 echo 'L_ADJNT    ='
 echo 'L_COSP     = -lcosp'
@@ -95 +93 @@
 echo
 #echo 'main : chimie $(DYN) bibio phys $(OPTION_DEP) '
-echo 'main : $(DYN) bibio dyn3d_common phys $(OPTION_DEP) '
+echo 'main : $(DYN) bibio phys $(OPTION_DEP) '
 echo '  cd $(LIBO) ; $(RANLIB) lib*.a ; cd $(GCM) ;\'
 echo '  cd $(LOCAL_DIR); \'

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