Changeset 2201 for branches/DEV_r1924_nocs_latphys/CONFIG/GYRE

Timestamp:

2010-10-11T15:13:35+02:00 (14 years ago)

Author:

acc

Message:

NEMO branch DEV_r1924_nocs_latphys. Merge in trunk chaanges from r1924 to r2200

Location:

branches/DEV_r1924_nocs_latphys/CONFIG/GYRE/scripts

Files:

• BB_make (modified) (18 diffs)
• BB_make.ldef (modified) (1 diff)

branches/DEV_r1924_nocs_latphys/CONFIG/GYRE/scripts/BB_make

@@ -7 +7 @@
 #          Check your compilers option in consequence when using real F95 compilers
 
+F_O += -I$(MODDIR) -I$(MODDIR)/oce -I$(NCDF_INC) $(USER_INC)
+L_X = $(L_O)
 #-Q- platine # Compiler options NEMO (CCRT Itanium Bull) 
 #-Q- platine F_O = -O3 -i4 -r8 -module $(MODDIR)/oce -I$(MODDIR) -I$(MODDIR)/oce -I$(NCDF_INC) $(USER_INC) 
@@ -101 +103 @@
 
 #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 +432 @@
 
 # Agrif library and conv
-libagrif :  $(call keycompat,key_iomput,key_agrif)
+libagrif :
 ifeq ($(AGRIF),use)
    @( if [ ! -d OPAFILES ]; then mkdir OPAFILES; fi )
@@ -1195 +1197 @@
    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 +1374 @@
    phycst.F90 \
    $(IOIPSL_LIB) \
-   KEY_CPP \
    dianam.F90
 $(MODEL_LIB)(diaptr.o) :   \
@@ -1419 +1434 @@
    diaptr.F90
 $(MODEL_LIB)(diawri.o) :   \
+   $(MODEL_LIB)(daymod.o) \
    $(MODEL_LIB)(dianam.o) \
    $(MODEL_LIB)(dom_ice_2.o) \
@@ -1446 +1462 @@
    $(MODEL_LIB)(sbcrnf.o) \
    $(MODEL_LIB)(zdf_oce.o) \
+   daymod.F90 \
    dianam.F90 \
    dom_ice_2.F90 \
@@ -4594 +4611 @@
    in_out_manager.F90 \
    lbcnfd.F90 \
-   $(AGRIF_LIB) \
    KEY_CPP \
    lib_mpp.F90
@@ -5309 +5325 @@
    $(MODEL_LIB)(limistate_2.o) \
    $(MODEL_LIB)(phycst.o) \
+   $(MODEL_LIB)(sbc_oce.o) \
    dom_ice_2.F90 \
    dom_oce.F90 \
@@ -5319 +5336 @@
    limistate_2.F90 \
    phycst.F90 \
+   sbc_oce.F90 \
    vectopt_loop_substitute.h90 \
    KEY_CPP \
@@ -7996 +8014 @@
    $(MODEL_LIB)(lib_print.o) \
    $(MODEL_LIB)(limwri_2.o) \
+   $(MODEL_LIB)(obc_oce.o) \
    $(MODEL_LIB)(obctra.o) \
    $(MODEL_LIB)(oce.o) \
@@ -8067 +8086 @@
    lib_print.f90 \
    limwri_2.F90 \
+   obc_oce.F90 \
    obctra.F90 \
    oce.F90 \
@@ -9620 +9640 @@
    $(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 +9665 @@
    lib_print.f90 \
    obc_oce.F90 \
+   obc_par.F90 \
    oce.F90 \
    par_kind.F90 \
@@ -9668 +9690 @@
    $(MODEL_LIB)(in_out_manager.o) \
    $(MODEL_LIB)(lbclnk.o) \
+   $(MODEL_LIB)(obc_oce.o) \
    $(MODEL_LIB)(obctra.o) \
    $(MODEL_LIB)(oce.o) \
@@ -9684 +9707 @@
    in_out_manager.F90 \
    lbclnk.F90 \
+   obc_oce.F90 \
    obctra.F90 \
    oce.F90 \
@@ -10172 +10196 @@
 $(MODEL_LIB)(trdmld.o) :   \
    $(MODEL_LIB)(c1d.o) \
+   $(MODEL_LIB)(daymod.o) \
    $(MODEL_LIB)(dom_oce.o) \
    $(MODEL_LIB)(eosbn2.o) \
@@ -10197 +10222 @@
    $(MODEL_LIB)(zpshde.o) \
    c1d.F90 \
+   daymod.F90 \
    dom_oce.F90 \
    eosbn2.F90 \

branches/DEV_r1924_nocs_latphys/CONFIG/GYRE/scripts/BB_make.ldef

@@ -34 +34 @@
 #-
 #- Prefix for preprocessing ---
+prefix = -D
 #-Q- sx8mercure prefix = -D
 #-Q- sx9mercure prefix = -D