Changeset 2004 for branches/DEV_r1784_mid_year_merge_2010/CONFIG/GYRE/scripts/BB_make

Timestamp:

2010-07-09T14:40:45+02:00 (14 years ago)

Author:

acc

Message:

ticket #684 step 8: Add in changes from the trunk between revisions 1879 and the 3.2.1 tag (rev 1986)

File:

• branches/DEV_r1784_mid_year_merge_2010/CONFIG/GYRE/scripts/BB_make (modified) (17 diffs)

branches/DEV_r1784_mid_year_merge_2010/CONFIG/GYRE/scripts/BB_make

@@ -101 +101 @@
 
 #check key compatibility
-keycompat=$(if $(and $(findstring $1,$(P_P)),$(findstring $2,$(P_P))),$(error $1 and $2 NOT compatible))
+keycompat=$(if $(word 2, $(findstring $1,$(P_P)) $(findstring $2,$(P_P))),$(error $1 and $2 NOT compatible))
 
 KEY_LIST = \
@@ -430 +430 @@
 
 # Agrif library and conv
-libagrif :  $(call keycompat,key_iomput,key_agrif)
+libagrif :
 ifeq ($(AGRIF),use)
    @( if [ ! -d OPAFILES ]; then mkdir OPAFILES; fi )
@@ -1195 +1195 @@
    diaar5.F90
 $(MODEL_LIB)(diadimg.o) :  \
-   $(MODEL_LIB)(lib_print.o) \
-   $(MODEL_LIB)(par_kind.o) \
-   $(MODEL_LIB)(par_oce.o) \
-   lib_print.f90 \
-   par_kind.F90 \
-   par_oce.F90 \
-   $(MODEL_LIB)(dom_oce.o) \
-   $(MODEL_LIB)(in_out_manager.o) \
-   $(MODEL_LIB)(oce.o) \
+   $(MODEL_LIB)(dom_oce.o) \
+   $(MODEL_LIB)(in_out_manager.o) \
+   $(MODEL_LIB)(iom.o) \
+   $(MODEL_LIB)(lib_print.o) \
+   $(MODEL_LIB)(par_kind.o) \
+   $(MODEL_LIB)(par_oce.o) \
+   $(MODEL_LIB)(phycst.o) \
+   $(MODEL_LIB)(prtctl.o) \
+   $(MODEL_LIB)(restart.o) \
+   dom_oce.F90 \
+   in_out_manager.F90 \
+   iom.F90 \
+   lib_print.f90 \
+   par_kind.F90 \
+   par_oce.F90 \
+   phycst.F90 \
+   prtctl.F90 \
+   restart.F90 \
+   $(MODEL_LIB)(daymod.o) \
+   $(MODEL_LIB)(dom_oce.o) \
+   $(MODEL_LIB)(in_out_manager.o) \
+   $(MODEL_LIB)(oce.o) \
+   daymod.F90 \
    dom_oce.F90 \
    in_out_manager.F90 \
@@ -1358 +1372 @@
    phycst.F90 \
    $(IOIPSL_LIB) \
-   KEY_CPP \
    dianam.F90
 $(MODEL_LIB)(diaptr.o) :   \
@@ -1419 +1432 @@
    diaptr.F90
 $(MODEL_LIB)(diawri.o) :   \
+   $(MODEL_LIB)(daymod.o) \
    $(MODEL_LIB)(dianam.o) \
    $(MODEL_LIB)(dom_ice_2.o) \
@@ -1446 +1460 @@
    $(MODEL_LIB)(sbcrnf.o) \
    $(MODEL_LIB)(zdf_oce.o) \
+   daymod.F90 \
    dianam.F90 \
    dom_ice_2.F90 \
@@ -4594 +4609 @@
    in_out_manager.F90 \
    lbcnfd.F90 \
-   $(AGRIF_LIB) \
    KEY_CPP \
    lib_mpp.F90
@@ -5309 +5323 @@
    $(MODEL_LIB)(limistate_2.o) \
    $(MODEL_LIB)(phycst.o) \
+   $(MODEL_LIB)(sbc_oce.o) \
    dom_ice_2.F90 \
    dom_oce.F90 \
@@ -5319 +5334 @@
    limistate_2.F90 \
    phycst.F90 \
+   sbc_oce.F90 \
    vectopt_loop_substitute.h90 \
    KEY_CPP \
@@ -7996 +8012 @@
    $(MODEL_LIB)(lib_print.o) \
    $(MODEL_LIB)(limwri_2.o) \
+   $(MODEL_LIB)(obc_oce.o) \
    $(MODEL_LIB)(obctra.o) \
    $(MODEL_LIB)(oce.o) \
@@ -8067 +8084 @@
    lib_print.f90 \
    limwri_2.F90 \
+   obc_oce.F90 \
    obctra.F90 \
    oce.F90 \
@@ -9620 +9638 @@
    $(MODEL_LIB)(lib_print.o) \
    $(MODEL_LIB)(obc_oce.o) \
+   $(MODEL_LIB)(obc_par.o) \
    $(MODEL_LIB)(oce.o) \
    $(MODEL_LIB)(par_kind.o) \
@@ -9644 +9663 @@
    lib_print.f90 \
    obc_oce.F90 \
+   obc_par.F90 \
    oce.F90 \
    par_kind.F90 \
@@ -9668 +9688 @@
    $(MODEL_LIB)(in_out_manager.o) \
    $(MODEL_LIB)(lbclnk.o) \
+   $(MODEL_LIB)(obc_oce.o) \
    $(MODEL_LIB)(obctra.o) \
    $(MODEL_LIB)(oce.o) \
@@ -9684 +9705 @@
    in_out_manager.F90 \
    lbclnk.F90 \
+   obc_oce.F90 \
    obctra.F90 \
    oce.F90 \
@@ -10172 +10194 @@
 $(MODEL_LIB)(trdmld.o) :   \
    $(MODEL_LIB)(c1d.o) \
+   $(MODEL_LIB)(daymod.o) \
    $(MODEL_LIB)(dom_oce.o) \
    $(MODEL_LIB)(eosbn2.o) \
@@ -10197 +10220 @@
    $(MODEL_LIB)(zpshde.o) \
    c1d.F90 \
+   daymod.F90 \
    dom_oce.F90 \
    eosbn2.F90 \