- Timestamp:
- Apr 16, 2014, 1:39:42 AM (10 years ago)
- Location:
- LMDZ5/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ5/trunk/create_make_gcm
r1990 r2016 49 49 echo "LOCAL_DIR=`echo $localdir`" 50 50 echo 'BIBIO = $(LIBF)/bibio' 51 echo 'DYN3D_COMMON = $(LIBF)/dyn3d_common'52 51 echo "FILTRE = filtre" 53 52 echo "PHYS = " … … 65 64 echo 'dyn2d = $(LIBO)/libdyn2d.a' 66 65 echo 'dyn1d = $(LIBO)/libdyn1d.a' 67 echo 'L_DYN = -ldyn$(DIM)d$(FLAG_PARA) '66 echo 'L_DYN = -ldyn$(DIM)d$(FLAG_PARA) -ldyn3d_common' 68 67 echo 'L_FILTRE = -l$(FILTRE)' 69 68 echo 'L_PHY = -lphy$(PHYS) ' 70 69 echo 'L_BIBIO = -lbibio' 71 echo 'L_DYN3D_COMMON = -ldyn3d_common'72 70 echo 'L_ADJNT =' 73 71 echo 'L_COSP = -lcosp' … … 95 93 echo 96 94 #echo 'main : chimie $(DYN) bibio phys $(OPTION_DEP) ' 97 echo 'main : $(DYN) bibio dyn3d_commonphys $(OPTION_DEP) '95 echo 'main : $(DYN) bibio phys $(OPTION_DEP) ' 98 96 echo ' cd $(LIBO) ; $(RANLIB) lib*.a ; cd $(GCM) ;\' 99 97 echo ' cd $(LOCAL_DIR); \' -
LMDZ5/trunk/makelmdz
r1990 r2016 84 84 85 85 CPP_KEY="" 86 INCLUDE='-I$(LIBF)/grid -I$(LIBF)/bibio -I$(LIBF)/ dyn3d_common -I$(LIBF)/filtrez -I. '86 INCLUDE='-I$(LIBF)/grid -I$(LIBF)/bibio -I$(LIBF)/filtrez -I. ' 87 87 LIB="" 88 88 adjnt="" … … 167 167 CPP_KEY="$CPP_KEY $2" ; shift ; shift ;; 168 168 169 "-adjnt")170 echo "not operational ... work to be done here ";exit171 opt_dep="$opt_dep adjnt" ; adjnt="-ladjnt -ldyn3d "172 optim="$optim -Dadj" ; shift ;;173 174 169 "-cosp") 175 170 cosp="$2" ; shift ; shift ;; … … 487 482 cp -p fxy_${grille}.h fxyprim.h 488 483 filtre="FILTRE=$filtre" 489 INCLUDE="$INCLUDE "'-I$(LIBF)/dyn3d${FLAG_PARA} '484 INCLUDE="$INCLUDE "'-I$(LIBF)/dyn3d${FLAG_PARA} -I$(LIBF)/dyn3d_common ' 490 485 elif (( $dimc == 2 )) ; then 491 486 filtre="FILTRE= L_FILTRE= " … … 493 488 elif (( $dimc == 1 )) ; then 494 489 filtre="L_DYN= DYN= FILTRE= L_FILTRE= DIRMAIN=phy$physique " 495 INCLUDE="$INCLUDE "'-I$(LIBF)/dyn3d ' # Pas tres propre490 INCLUDE="$INCLUDE "'-I$(LIBF)/dyn3d -I$(LIBF)/dyn3d_common ' # Pas tres propre 496 491 else 497 492 echo Dimension dimc=$dimc pas prevu ; exit … … 508 503 then 509 504 SUFF_NAME=${SUFF_NAME}_para 510 DYN= dyn${dimc}d${paramem}505 DYN="dyn${dimc}d${paramem} dyn3d_common" 511 506 if [[ "$paramem" == "mem" ]] 512 507 then … … 515 510 else 516 511 SUFF_NAME=${SUFF_NAME}_seq 517 DYN= dyn${dimc}d512 DYN="dyn${dimc}d dyn3d_common" 518 513 fi 519 514 … … 574 569 if [[ -r $LMDGCM/libf/dyn${dimc}d${FLAG_PARA}/${code}.F90 ]] 575 570 then 571 source_code=${code}.F90 572 elif [[ -r $LMDGCM/libf/phy$physique/${code}.F90 ]] ; then 576 573 source_code=${code}.F90 577 574 fi
Note: See TracChangeset
for help on using the changeset viewer.