Changeset 1302

Timestamp:

2009-02-10T09:52:06+01:00 (15 years ago)

Author:

ctlod

Message:

correct minor bugs, see ticket: #240

Location:

trunk/NVTK

Files:

• INSTALL/ins_nvtk.ksh (modified) (1 diff)
• Makefile (modified) (1 diff)
• use_cfg (modified) (2 diffs)

trunk/NVTK/INSTALL/ins_nvtk.ksh

@@ -120 +120 @@
        cp ./CONFIG_FILES/BB_make.ldef_${CONF[${ind}]} ../../${CONF[${ind}]}/scripts/BB_make.ldef
 
+       # Configuration dependencies
+       (cd ../../${CONF[${ind}]} ; ../NVTK/fait_AA_make ; )
+echo '                  '
+echo "             >>>>>>>>   Dependencies file ./config/${CONF[${ind}]}/BB_make have been re-built"
+
        # III. Build output sub-directories
        # #################################

trunk/NVTK/Makefile

@@ -74 +74 @@
    @echo `svn info ../../modeles/NEMO | grep URL` >> ../$@/specifs.txt
    @echo `svn info ../../modeles/NEMO | grep Revision ` >> ../$@/specifs.txt
-   @( `(cd 2TEST ; ls *.[Ffh]90 > ../../$@/f2test.txt )` )
+   @( LSFILES=`(cd 2TEST ; ls *.[Ffh]90 )` ; if [ -n "$$LSFILES" ] ; \
+     then echo $$LSFILES > ../$@/f2test.txt ; else rm -f ../$@/f2test.txt ; \
+          touch ../$@/f2test.txt ; fi ; )
    @echo 
    @echo '             ----->>>>>>>>>   Links from NVTK/2TEST to '$@/MY_SRC 'done'

trunk/NVTK/use_cfg

@@ -203 +203 @@
      \rm trcstp.F90                    
      \rm sms.F90                    
+     \rm trcini.F90
       ln -sf ../../../modeles/NEMO/TOP_SRC/*.[Ffh]90 . 
-      ln -sf ../../../modeles/NEMO/TOP_SRC/TRP/*.[Ffh]90 .
-      ln -sf ../../../modeles/NEMO/TOP_SRC/PISCES/*.[Ffh]90 . 
-      ln -sf ../../../modeles/NEMO/TOP_SRC/LOBSTER/*.[Ffh]90 . 
-      ln -sf ../../../modeles/NEMO/TOP_SRC/CFC/*.[Ffh]90 . 
-      ln -sf ../../../modeles/NEMO/TOP_SRC/C14b/*.[Ffh]90 . 
-      ln -sf ../../../modeles/NEMO/TOP_SRC/MY_TRC/*.[Ffh]90 . 
-      ln -sf ../../../modeles/NEMO/TOP_SRC/DUMMY/*.[Ffh]90 .
+      ln -sf ../../../modeles/NEMO/TOP_SRC/*/*.[Ffh]90 . 
       
-      elif [ "${TAB[i]}" = "SRC_OFFLINE_TOP" ]; then  
-     ln -sf ../../../modeles/NEMO/TOP_SRC/*.[Ffh] .
-     ln -sf ../../../modeles/NEMO/TOP_SRC/SMS/*.[Ffh] .
-     ln -sf ../../../modeles/NEMO/SRC_OFFLINE_TOP/*.[Ffh] .
+      elif [ "${TAB[i]}" = "OFF_SRC" ]; then  
+     ln -sf ../../../modeles/NEMO/OFF_SRC/*.[Ffh]90 .
+     ln -sf ../../../modeles/NEMO/OFF_SRC/*/*.[Ffh]90 .
 
       elif [ "${TAB[i]}" = "C1D_SRC" ]; then  
@@ -221 +215 @@
 
       elif [ "${TAB[i]}" = "NST_SRC" ]; then  
+    \rm agrif_opa_interp.F90
+    \rm agrif_opa_sponge.F90
+    \rm agrif_opa_update.F90
+    \rm agrif_top_interp.F90
+    \rm agrif_top_sponge.F90
+    \rm agrif_top_update.F90
      ln -sf ../../../modeles/NEMO/NST_SRC/*.[Ffh]90 .
       fi