Changeset 2202

Timestamp:

02/11/14 15:34:18 (10 years ago)

Author:

aclsce

Message:

New IPSLCM6_rc0 configuration

• LMDZ5 trunk revision 1965
• NEMOGCM branches/2013/dev_MERGE_2013/NEMOGCM rev 4330
• ORCHIDEE version orchidee_1_9_5
• OASIS3-MCT 2.0_branch rev 911
• XIOS trunk revision 475
• libIGCM trunk rev 981

Fixed small bug.

Location:

modipsl/trunk/util

Files:

• ins_make (modified) (1 diff)
• mod.def (modified) (2 diffs)

modipsl/trunk/util/ins_make

@@ -177 +177 @@
 done
 #-
-#- Specific to OASIS-MCT
+#- Specific to OASIS3-MCT
 if [ -d ${d_n}/../oasis3-mct ] ; 
 then
     mk_dir=$(cd ${d_n}/../oasis3-mct;/bin/pwd;);
-        l_make=$(find ${d_n}/../config/IPSLCM6/SOURCES/OASIS-MCT -name "make*" -print)
+        l_make=$(find ${d_n}/../config/IPSLCM6/SOURCES/OASIS3-MCT -maxdepth 1 -name "make*" -print)
             W_X1="COUPLE          ="
             for j in ${l_make}
             do  
-                cp ${j} ${d_n}/../config/IPSLCM6/SOURCES/OASIS-MCT/mk3.$$
-                sed -e "s!^${W_X1}.*!${W_X1} ${mk_dir}!" ${d_n}/../config/IPSLCM6/SOURCES/OASIS-MCT/mk3.$$ > ${j}
-                rm -f ${d_n}/../config/IPSLCM6/SOURCES/OASIS-MCT/mk3.$$
+                cp ${j} ${d_n}/../config/IPSLCM6/SOURCES/OASIS3-MCT/mk3.$$
+                sed -e "s!^${W_X1}.*!${W_X1} ${mk_dir}!" ${d_n}/../config/IPSLCM6/SOURCES/OASIS3-MCT/mk3.$$ > ${j}
+                rm -f ${d_n}/../config/IPSLCM6/SOURCES/OASIS3-MCT/mk3.$$
             done
 fi

modipsl/trunk/util/mod.def

@@ -30 +30 @@
 #-S- 13 svn http://forge.ipsl.jussieu.fr/fcm/svn
 #-S- 14 svn svn://forge.ipsl.jussieu.fr/orchidee
+#-S- 15 svn http://oasis3mct.cerfacs.fr/svn
 #-S- 16 svn svn+ssh://XXLOGIN@forge.ipsl.jussieu.fr/projets/lmdz-reprobus/svn
 #---------------------------------------------------------------------
@@ -81 +82 @@
 #-H- IPSLCM6_rc0  IPSLCM6_rc0 coupled configuration
 #-H- IPSLCM6_rc0  Working configuration started 17/04/2013
-#-H- IPSLCM6_rc0  with 5 NEMO sub-domains for vargas or titane by default
-#-H- IPSLCM6_rc0  NEMOGCM trunk revision 3940
-#-H- IPSLCM6_rc0  XIOS trunk revision 445
+#-H- IPSLCM6_rc0  with 5 NEMO sub-domains for curie or ada by default
+#-H- IPSLCM6_rc0  NEMOGCM branches/2013/dev_MERGE_2013/NEMOGCM rev 4330 
+#-H- IPSLCM6_rc0  XIOS trunk revision 475
 #-H- IPSLCM6_rc0  IOIPSL/src svn tags/v2_2_2
-#-H- IPSLCM6_rc0  LMDZ5 trunk revision 1729
+#-H- IPSLCM6_rc0  LMDZ5 trunk revision 1965
 #-H- IPSLCM6_rc0  ORCHIDEE version orchidee_1_9_5
-#-H- IPSLCM6_rc0  OASIS3 rev 2040 trunk
-#-H- IPSLCM6_rc0  IPSLCM5_v5 svn
-#-H- IPSLCM6_rc0  libIGCM tag libIGCM_v2.1
+#-H- IPSLCM6_rc0  OASIS3-MCT 2.0_branch rev 911
+#-H- IPSLCM6_rc0  IPSLCM6 svn
+#-H- IPSLCM6_rc0  libIGCM trunk rev 981
 #-M- IPSLCM6_rc0  arnaud.caubel@lsce.ipsl.fr
-#-C- IPSLCM6_rc0  IOIPSL/tags/v2_2_2/src        HEAD         8  IOIPSL/src     modeles
-#-C- IPSLCM6_rc0  tags/ORCHIDEE_1_9_5/ORCHIDEE  HEAD        14  ORCHIDEE       modeles
-#-C- IPSLCM6_rc0  CPL/oasis3/trunk              2040         8  prism          .
-#-C- IPSLCM6_rc0  LMDZ5/trunk                   1729        11  LMDZ           modeles
-#-C- IPSLCM6_rc0  CONFIG/UNIFORM/v6/IPSLCM6     HEAD         8  IPSLCM6        config
-#-C- IPSLCM6_rc0  tags/libIGCM_v2.1             HEAD        10  libIGCM        .
-#-C- IPSLCM6_rc0  trunk/NEMOGCM                 3940         7  .              modeles
-#-C- IPSLCM6_rc0  XIOS/trunk                     445        12  XIOS           modeles
+#-C- IPSLCM6_rc0  IOIPSL/tags/v2_2_2/src                    HEAD         8  IOIPSL/src     modeles
+#-C- IPSLCM6_rc0  tags/ORCHIDEE_1_9_5/ORCHIDEE              HEAD        14  ORCHIDEE       modeles
+#-C- IPSLCM6_rc0  branches/OASIS3-MCT_2.0_branch/oasis3-mct  911        15  oasis3-mct     .
+#-C- IPSLCM6_rc0  LMDZ5/trunk                               1965        11  LMDZ           modeles
+#-C- IPSLCM6_rc0  CONFIG/UNIFORM/v6/IPSLCM6                 HEAD         8  IPSLCM6        config
+#-C- IPSLCM6_rc0  trunk/libIGCM                              981        10  libIGCM        .
+#-C- IPSLCM6_rc0  branches/2013/dev_MERGE_2013/NEMOGCM      4330         7  .              modeles
+#-C- IPSLCM6_rc0  XIOS/trunk                                 475        12  XIOS           modeles