Changeset 1934

Timestamp:

12/04/12 16:04:00 (11 years ago)

Author:

jgipsl

Message:

Added configuration avec only LMDZ. This is the same as LMDZOR but without "the orchidee parts". Compilation is slightly different.

Location:

CONFIG/UNIFORM/v5

Files:

• LMDZOR_v5/EXPERIMENTS/LMDZOR (deleted)
• LMDZOR_v5/GENERAL/DRIVER/orchidee.driver (deleted)
• LMDZOR_v5/GENERAL/DRIVER/stomate.driver (deleted)
• LMDZOR_v5/GENERAL/PARAM/orchidee.def (deleted)
• LMDZOR_v5/GENERAL/POST/monitoring01_orchidee.cfg (deleted)
• LMDZOR_v5/GENERAL/POST/monitoring01_stomate.cfg (deleted)
• LMDZ_v5 (copied) (copied from CONFIG/UNIFORM/v5/LMDZOR_v5)
• LMDZ_v5/AA_make (modified) (3 diffs)
• LMDZ_v5/GENERAL/DRIVER/lmdz.driver (copied) (copied from CONFIG/UNIFORM/v5/LMDZOR_v5/GENERAL/DRIVER/lmdz.driver)
• LMDZ_v5/README (modified) (1 diff)

CONFIG/UNIFORM/v5/LMDZ_v5/AA_make

@@ -1 +1 @@
 #- $Id$
 #-
-#- AA_make for LMDZOR_uni configuration
+#- AA_make for LMDZ_v5 configuration
 #- 
 
@@ -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 lmdz44x43x19 verif  
         echo "noORCAxLMD4443" >.resol
         echo "RESOL_ATM_3D=44x43x19" >>.resol
 
-LMD5655 : libioipsl liborchidee lmdz56x55x19 verif      
+LMD5655 : libioipsl lmdz56x55x19 verif  
         echo "noORCAxLMD5655" >.resol
         echo "RESOL_ATM_3D=56x55x19" >>.resol
 
-LMD9671 : libioipsl liborchidee lmdz96x71x19 verif      
+LMD9671 : libioipsl lmdz96x71x19 verif  
         echo "noORCAxLMD9671" >.resol
         echo "RESOL_ATM_3D=96x71x19" >>.resol
 
-LMD9695 : libioipsl liborchidee lmdz96x95x19 verif
+LMD9695 : libioipsl lmdz96x95x19 verif
         echo "noORCAxLMD9695" >.resol
         echo "RESOL_ATM_3D=96x95x19" >>.resol
 
-LMD9695-L39 : libioipsl liborchidee lmdz96x95x39 verif
+LMD9695-L39 : libioipsl lmdz96x95x39 verif
         echo "noORCAxLMD9695-L39" >.resol
         echo "RESOL_ATM_3D=96x95x39" >>.resol
 
-LMD144142 : libioipsl liborchidee lmdz144x142x19 verif
+LMD144142 : libioipsl lmdz144x142x19 verif
         echo "noORCAxLMD144142" >.resol
         echo "RESOL_ATM_3D=144x142x19" >>.resol
 
-LMD144142-L39 : libioipsl liborchidee lmdz144x142x39 verif
+LMD144142-L39 : libioipsl 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)
- 
 
 libioipsl : ../../modeles/IOIPSL/src
         (cd ../../modeles/IOIPSL/src ; $(M_K) -f Makefile)
-
-
-liborchidee : ../../modeles/ORCHIDEE/
-        (cd ../../modeles/ORCHIDEE/ ; $(M_K) -f Makefile)
-
-liborchideefcm : ../../modeles/ORCHIDEE/
-        (cd ../../modeles/ORCHIDEE/ ; ./makeorchidee_fcm -parallel mpi -arch $(FCM_ARCH) ; cp lib/lib*a ../../lib/.)
-
 
 lmdz44x43x19:
@@ -73 +61 @@
 
 lmdz: ../../modeles/LMDZ
-        (cd ../../modeles/LMDZ; ./makelmdz_fcm -cpp ORCHIDEE_NOOPENMP -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 -cpp ORCHIDEE_NOOPENMP -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 false -parallel mpi -arch $(FCM_ARCH) ce0l ; cp bin/ce0l_$(RESOL_LMDZ)_phylmd_para.e ../../bin/create_etat0_limit.e ; )
+        (cd ../../modeles/LMDZ; ./makelmdz_fcm -d $(RESOL_LMDZ) -cosp true -v false -parallel mpi -arch $(FCM_ARCH) gcm ; cp bin/gcm_$(RESOL_LMDZ)_phylmd_para.e ../../bin/gcm.e ; )
 
 

CONFIG/UNIFORM/v5/LMDZ_v5/README

@@ -1 +1 @@
 How to create a job and run directory :
 
-Choose in EXPERIMENTS the experiment to be done and copy the corresponding config.card to modipsl/config/LMDZOR_v5/, beside this README file. Modify the config.card as usual, for at least the JobName. Apply ../../util/ins_job and the creation of a new run directory will be done :
+Choose in EXPERIMENTS the experiment to be done and copy the corresponding config.card to modipsl/config/LMDZ_v5/, beside this README file. Modify the config.card as usual, for at least the JobName. Apply ../../util/ins_job and the creation of a new run directory will be done :
   - the run directory will be created with the same name as JobName in config.card. If a directory with the same name already exists, nothing will be done.
   - the PARAM, DRIVER and POST directories from GENERAL/ will be copied into the new run directory.