Changeset 2203

Timestamp:

02/13/14 11:42:37 (10 years ago)

Author:

jgipsl

Message:

• Add compiling of XIOS and compile all models with option for XIOS
• Use fcm also for ORCHIDEE
• Compile each model (XIOS, ORCHIDEE and LMDZ) in parallele using option -j or -job

File:

• CONFIG/UNIFORM/v6/LMDZOR_v6/AA_make (modified) (3 diffs)

CONFIG/UNIFORM/v6/LMDZOR_v6/AA_make

@@ -7 +7 @@
         if [ -s ./.resol ] ; then $(M_K) `head -1 .resol |cut -c 8-` ; else $(M_K) LMD9695-L39 ; fi
 
-LMD4443 : libioipsl liborchidee lmdz44x43x19 verif      
+LMD4443 : libioipsl xios liborchidee lmdz44x43x19 verif 
         echo "noORCAxLMD4443" >.resol
         echo "RESOL_ATM_3D=44x43x19" >>.resol
 
-LMD5655 : libioipsl liborchidee lmdz56x55x19 verif      
+LMD5655 : libioipsl xios liborchidee lmdz56x55x19 verif 
         echo "noORCAxLMD5655" >.resol
         echo "RESOL_ATM_3D=56x55x19" >>.resol
 
-LMD9671 : libioipsl liborchidee lmdz96x71x19 verif      
+LMD9671 : libioipsl xios liborchidee lmdz96x71x19 verif 
         echo "noORCAxLMD9671" >.resol
         echo "RESOL_ATM_3D=96x71x19" >>.resol
 
-LMD9695 : libioipsl liborchidee lmdz96x95x19 verif
+LMD9695 : libioipsl xios liborchidee lmdz96x95x19 verif
         echo "noORCAxLMD9695" >.resol
         echo "RESOL_ATM_3D=96x95x19" >>.resol
 
-LMD9695-L39 : libioipsl liborchidee lmdz96x95x39 verif
+LMD9695-L39 : libioipsl xios liborchidee lmdz96x95x39 verif
         echo "noORCAxLMD9695-L39" >.resol
         echo "RESOL_ATM_3D=96x95x39" >>.resol
 
-LMD128118-L39 : libioipsl liborchidee lmdz128x118x39 verif
+LMD128118-L39 : libioipsl xios liborchidee lmdz128x118x39 verif
         echo "noORCAxLMD128118-L39" >.resol
         echo "RESOL_ATM_3D=128x118x39" >>.resol
 
-LMD144142 : libioipsl liborchidee lmdz144x142x19 verif
+LMD144142 : libioipsl xios liborchidee lmdz144x142x19 verif
         echo "noORCAxLMD144142" >.resol
         echo "RESOL_ATM_3D=144x142x19" >>.resol
 
-LMD144142-L39 : libioipsl liborchidee lmdz144x142x39 verif
+LMD144142-L39 : libioipsl xios liborchidee lmdz144x142x39 verif
         echo "noORCAxLMD144142-L39" >.resol
         echo "RESOL_ATM_3D=144x142x39" >>.resol
 
-# ORCHIDEE_DRIVER : only for ORCHIDEE/trunk rev 1042 or later
-ORCHIDEE_DRIVER : libioipsl ../../modeles/ORCHIDEE/
-        (cd ../../modeles/ORCHIDEE/ ; $(M_K) -f Makefile driver)
- 
+
+xios :
+        (cd  ../../modeles/XIOS ; ./make_xios --prod --arch ${FCM_ARCH} --job 8 ; cp bin/xios_server.exe ../../bin/. ; )
 
 libioipsl : ../../modeles/IOIPSL/src
@@ -49 +48 @@
 
 liborchidee : ../../modeles/ORCHIDEE/
-        (cd ../../modeles/ORCHIDEE/ ; $(M_K) -f Makefile driver)
-
-liborchideefcm : ../../modeles/ORCHIDEE/
-        (cd ../../modeles/ORCHIDEE/ ; ./makeorchidee_fcm -parallel mpi -arch $(FCM_ARCH) ; cp lib/lib*a ../../lib/.)
+        (cd ../../modeles/ORCHIDEE/ ; ./makeorchidee_fcm -parallel mpi -arch $(FCM_ARCH) -j 8 -xios -driver)
 
 
@@ -80 +76 @@
 
 lmdz: ../../modeles/LMDZ
-        (cd ../../modeles/LMDZ; ./makelmdz_fcm -d $(RESOL_LMDZ) -cosp true -v true -parallel mpi -arch $(FCM_ARCH) ce0l ; cp bin/ce0l_$(RESOL_LMDZ)_phylmd_para_orch.e ../../bin/create_etat0_limit.e ; )
-        (cd ../../modeles/LMDZ; ./makelmdz_fcm -d $(RESOL_LMDZ) -cosp true -v true -parallel mpi -arch $(FCM_ARCH) gcm ; cp bin/gcm_$(RESOL_LMDZ)_phylmd_para_orch.e ../../bin/gcm.e ; )
+        (cd ../../modeles/LMDZ; ./makelmdz_fcm -d $(RESOL_LMDZ) -cosp true -v true -parallel mpi -arch $(FCM_ARCH) -j 8 -io xios ce0l ; cp bin/ce0l_$(RESOL_LMDZ)_phylmd_para_orch.e ../../bin/create_etat0_limit.e ; )
+        (cd ../../modeles/LMDZ; ./makelmdz_fcm -d $(RESOL_LMDZ) -cosp true -v true -parallel mpi -arch $(FCM_ARCH) -j 8 -io xios gcm ; cp bin/gcm_$(RESOL_LMDZ)_phylmd_para_orch.e ../../bin/gcm.e ; )