Changeset 10091

Timestamp:

2018-09-05T16:21:46+02:00 (6 years ago)

Author:

rblod

Message:

Compilation for NESTING_AGRIF

Location:

utils/tools_AGRIF_CMEMS_2020/NESTING_AGRIF

Files:

• MODEL.CPP (modified) (1 diff)
• Makefile (modified) (6 diffs)

utils/tools_AGRIF_CMEMS_2020/NESTING_AGRIF/MODEL.CPP

@@ +1 @@
+#define key_agrif

utils/tools_AGRIF_CMEMS_2020/NESTING_AGRIF/Makefile

@@ -17 +17 @@
 FILES=src/*
 OBJS=$(addsuffix .o,$(addprefix $(DIR_OBJS)/,$(FILENAMES)))
+OBJS := $(filter-out obj/agrif2model.o, $(OBJS))
+
 PROG=create_coordinate
 
@@ -28 +30 @@
 
 create_coordinate: $(DIR_LIB)/libnesting.a $(DIR_PPSRC)/create_coordinate.f90
-      $(FC) $(LINKFLAGS) $(FFLAGS) -o create_coordinate $(DIR_PPSRC_2)/create_coordinate.f90 $(DIR_LIB)/libnesting.a $(LIBS) -I$(DIR_OBJS) $(FFLAGS_SPEC) -I../../ext/AGRIF
+      $(FC) $(LINKFLAGS) $(FFLAGS) -o create_coordinate -L$(DIR_LIB) -lnesting $(LIBS) -I$(DIR_OBJS) $(FFLAGS_SPEC) -I../../ext/AGRIF  -L../../ext/AGRIF -lagrif
 
 prepagrif:
@@ -47 +49 @@
 
 conv:
-      gmake -C ../../ext/AGRIF/LIB
+      $(MAKE) -C ../../ext/AGRIF/LIB
 
 AGRIF_LIB: 
-      gmake -C ../../ext/AGRIF FC=$(FC) CPP=$(CPP) FFLAGS="$(FFLAGS)"
+      $(MAKE) -C ../../ext/AGRIF FC=$(FC) CPP=$(CPP) FFLAGS="$(FFLAGS)"
 
-$(DIR_LIB)/libnesting.a: $(OBJS)
+$(DIR_LIB)/libnesting.a: $(OBJS) $(DIR_OBJS)/agrif2model.o
       @echo
       @echo ===================================================
       @echo   Compile Nesting library...
       @echo ===================================================
-      $(AR) -r $@ $(OBJS)
+      $(AR) -r $@ $(OBJS) $(DIR_OBJS)/agrif2model.o
       ranlib $@
       @echo
 
 
+$(DIR_OBJS)/agrif2model.o: $(DIR_FILES)/agrif2model.F90 Makefile  MODEL.CPP 
+      $(CPP) -I$(DIR_PPSRC)/AGRIF_INC -include MODEL.CPP $(CPPFLAGS) $(DIR_FILES)/$(*F).F90 > $(DIR_PPSRC_2)/$(*F).f90
+      $(FC) $(FFLAGS) -c $(DIR_PPSRC_2)/$(*F).f90 -o $(DIR_OBJS)/$(*F).o -I../../ext/AGRIF -I$(DIR_OBJS)  
 
 $(DIR_OBJS)/%.o: $(DIR_FILES)/%.F90 Makefile  MODEL.CPP 
@@ -68 +73 @@
       -comdirin ./ -comdirout AGRIF_MODELFILES/. -convfile $(*F).f90)
       $(CPP) -I$(DIR_PPSRC)/AGRIF_INC -include MODEL.CPP $(CPPFLAGS)  $(DIR_PPSRC)/AGRIF_MODELFILES/$(*F).f90 >$(DIR_PPSRC_2)/$(*F).f90   
-      $(FC) $(FFLAGS) -c $(DIR_PPSRC_2)/$(*F).f90 -o $(DIR_OBJS)/$(*F).o -I../../ext/AGRIF -I$(DIR_OBJS)  $(FFLAGS_SPEC) 
+      $(FC) $(FFLAGS) -c $(DIR_PPSRC_2)/$(*F).f90 -o $(DIR_OBJS)/$(*F).o -I../../ext/AGRIF -I$(DIR_OBJS)  -J$(DIR_OBJS)
 
 $(DIR_OBJS)/%.o: $(DIR_FILES)/%.f90 Makefile MODEL.CPP 
@@ -75 +80 @@
       -comdirin ./ -comdirout AGRIF_MODELFILES/. -convfile $(*F).f90)
       $(CPP) -I$(DIR_PPSRC)/AGRIF_INC -include MODEL.CPP $(CPPFLAGS)  $(DIR_PPSRC)/AGRIF_MODELFILES/$(*F).f90 >$(DIR_PPSRC_2)/$(*F).f90   
-      $(FC) $(FFLAGS) -c $(DIR_PPSRC_2)/$(*F).f90 -o $(DIR_OBJS)/$(*F).o -I../../ext/AGRIF -I$(DIR_OBJS)  $(FFLAGS_SPEC) 
+      $(FC) $(FFLAGS) -c $(DIR_PPSRC_2)/$(*F).f90 -o $(DIR_OBJS)/$(*F).o -I../../ext/AGRIF -I$(DIR_OBJS)  -J$(DIR_OBJS) 
 
 #$(DIR_OBJS)/%.o: $(DIR_FILES)/%.F Makefile MODEL.CPP
@@ -118 +123 @@
       @echo ===================================================
       $(RM) -rf $(DIR_PPSRC) $(DIR_PPSRC_2) $(DIR_LIB) $(DIR_OBJS) $(PROGS) 
+
+cleangrif:  
+      @echo
+      @echo ===================================================
+      @echo   Clean agrif and conv ...
+      @echo ===================================================
+      $(MAKE) clean -C ../../ext/AGRIF/LIB 
+      $(MAKE) clean -C ../../ext/AGRIF 
+
+cleanall: clean cleangrif
    
 # DO NOT DELETE THIS LINE - used by make depend