Changeset 76

Timestamp:

06/26/07 14:07:17 (17 years ago)

Author:

mmaipsl

Message:

MM: correct ORCHIDEE compilation for all ORCHIDEE versions.

File:

• CONFIG/trunk/IPSLCM4_v2/AA_make (modified) (2 diffs)

CONFIG/trunk/IPSLCM4_v2/AA_make

@@ -33 +33 @@
         if [ -s ./.resol ] ; then gmake `cat .resol` ; else gmake ORCA2xLMD9671 ; fi
 
-ORCA4xLMD7245 : libioipsl oasis3 libparameters libstomate libsechiba lmdz7245 orca4
+ORCA4xLMD7245 : libioipsl oasis3 liborchidee lmdz7245 orca4
         echo "ORCA4xLMD7245" >.resol
         echo "$(LIB_MPI)" >.libmpi
 
-ORCA2xLMD7245 : libioipsl oasis3 libparameters libstomate libsechiba lmdz7245 orca2
+ORCA2xLMD7245 : libioipsl oasis3 liborchidee lmdz7245 orca2
         echo "ORCA2xLMD7245" >.resol
         echo "$(LIB_MPI)" >.libmpi
 
-ORCA2xLMD9671 : libioipsl oasis3 libparameters libstomate libsechiba lmdz9671 orca2
+ORCA2xLMD9671 : libioipsl oasis3 liborchidee lmdz9671 orca2
         echo "ORCA2xLMD9671" >.resol
         echo "$(LIB_MPI)" >.libmpi
 
-ORCA2xLMD14496 : libioipsl oasis3 libparameters libstomate libsechiba lmdz14496 orca2
+ORCA2xLMD14496 : libioipsl oasis3 liborchidee lmdz14496 orca2
         echo "ORCA2xLMD14496" >.resol
         echo "$(LIB_MPI)" >.libmpi
 
-ORCA2xLMD144142 : libioipsl oasis3 libparameters libstomate libsechiba lmdz144142 orca2
+ORCA2xLMD144142 : libioipsl oasis3 liborchidee lmdz144142 orca2
         echo "ORCA2xLMD144142" >.resol
         echo "$(LIB_MPI)" >.libmpi
@@ -62 +62 @@
         (cd $(PRISM_DIR) ; ./util/compile/frames/Create_COMP_libs.frm  - - "${PRISM_NAME}" "${LIB_MPI_BIS}" ; ./util/compile/frames/Create_COMP_models.frm oasis3 "${LIB_MPI_BIS}" - - "${PRISM_NAME}" "" "" ; )
 
-libparameters :
-        (cd ../../modeles/ORCHIDEE/src_parameters ; $(M_K) -f Makefile)
-
-libsechiba :
-        (cd ../../modeles/ORCHIDEE/src_sechiba ; $(M_K) -f Makefile)
-
-libstomate :
-        (cd ../../modeles/ORCHIDEE/src_stomate ; $(M_K) -f Makefile)
-
-precsechiba :
-        (cd ../../modeles/ORCHIDEE/src_parameters ; $(M_K) -f Makefile checkprec)
+liborchidee :
+        (cd ../../modeles/ORCHIDEE/ ; $(M_K) -f Makefile)
 
 config : libioipsl
         (cd ../../modeles/IOIPSL/src; $(M_K) -f Makefile config)
-        (cd ../../modeles/ORCHIDEE/src_parameters; $(M_K) -f Makefile config)
-        (cd ../../modeles/ORCHIDEE/src_sechiba; $(M_K) -f Makefile config)
-        (cd ../../modeles/ORCHIDEE/src_stomate; $(M_K) -f Makefile config)
+        (cd ../../modeles/ORCHIDEE/; $(M_K) -f Makefile config)
         $(BINDIR)/Fparser -main -name ORCHIDEE_OL $(MODS1)
         $(SCPDIR)/build_tkmenus