Changeset 2965

Timestamp:

08/11/16 14:11:37 (8 years ago)

Author:

aclsce

Message:

• Added IPSLCM5A2 configuration
• Some cleaning

Location:

modipsl/trunk/util

Files:

• ins_make (modified) (1 diff)
• mod.def (modified) (1 diff)
• model (modified) (4 diffs)

modipsl/trunk/util/ins_make

@@ -180 +180 @@
 if [ -d ${d_n}/../oasis3-mct ] ; 
 then
-    l_dir=$(find ${d_n}/../config  -maxdepth 1 -name "IPSLCM6*" -print)
+    l_dir=$(find ${d_n}/../config  -maxdepth 1 \( -name "IPSLCM6*" -o -name "IPSLCM5A2*" \) -print)
     for i in ${l_dir}
     do 

modipsl/trunk/util/mod.def

@@ -80 +80 @@
 #-C- IPSLCM5_v5  XMLF90                         427        12  .              modeles
 #-C- IPSLCM5_v5  XMLIO_SERVER/trunk             427        12  XMLIO_SERVER   modeles
+
+#-H- IPSLCM5A2  IPSLCM5A2 coupled configuration
+#-H- IPSLCM5A2  1st frozen IPSLCM5A2 version 
+#-H- IPSLCM5A2  NEMOGCM branch nemo_v3_6_STABLE revision 6665
+#-H- IPSLCM5A2  XIOS2 trunk revision 858
+#-H- IPSLCM5A2  IOIPSL/src svn tags/v2_2_2
+#-H- IPSLCM5A2  LMDZ5 trunk rev 2595
+#-H- IPSLCM5A2  ORCHIDEE version trunk rev 3525
+#-H- IPSLCM5A2  OASIS3-MCT 2.0_branch rev 1129
+#-H- IPSLCM5A2  IPSLCM5A2 svn 
+#-H- IPSLCM5A2  libIGCM trunk rev 1330
+#-M- IPSLCM5A2  arnaud.caubel@lsce.ipsl.fr
+#-C- IPSLCM5A2  IOIPSL/tags/v2_2_2/src                    HEAD         8  IOIPSL/src     modeles
+#-C- IPSLCM5A2  trunk/ORCHIDEE                            3525        14  ORCHIDEE       modeles
+#-C- IPSLCM5A2  branches/OASIS3-MCT_2.0_branch/oasis3-mct 1129        15  oasis3-mct     .
+#-C- IPSLCM5A2  LMDZ5/branches/testing                    2595        11  LMDZ           modeles
+#-C- IPSLCM5A2  CONFIG/UNIFORM/v6/IPSLCM5A2               HEAD         8  IPSLCM5A2        config
+#-C- IPSLCM5A2  trunk/libIGCM                             1330        10  libIGCM        .
+#-C- IPSLCM5A2  branches/2015/nemo_v3_6_STABLE/NEMOGCM    6665         7  .              modeles
+#-C- IPSLCM5A2  XIOS/trunk                                 858        12  XIOS           modeles
 
 #-H- IPSLCM6_rc0  IPSLCM6_rc0 coupled configuration

modipsl/trunk/util/model

@@ -390 +390 @@
 #-
 case ${m_n} in
-  ( EEL* |  ORCA* | OFF_TRC | IPSLCM4* | IPSL_ESM_v1 | ORCA_TOYATM | \
-    NEMO_ORCA2_LIM | GYRE )
+  ( IPSLCM4_LOOP )
     d_m1=${d_m}/modeles/OPA  ;
     [ -d ${d_m1}/WORK ] && \rm -rf ${d_m1}/WORK;
@@ -399 +398 @@
     ln -sf ../../../*/${m_n}/scripts/BB_make AA_make;
     ln -sf ../../../*/${m_n}/scripts/BB_make.ldef AA_make.ldef ;
-    case ${m_n} in
-     ( ORCA2_LMDZ96x71 )
-      echo " Creation du catalogue OPA/WORK = ORCA + LIM"
-      ln -sf ../SRC_ORCA/*.[Ffh] .
-      ln -sf ../SRC_UCL/[a-z]* .
-      ln -sf ../../${m_n}/scripts/prep.sed.coupled .;;
-     ( ORCA2 | ORCA4 | ORCA05 | EEL2 | EEL6 )
-      echo " Creation du catalogue OPA/WORK = ORCA"
-      ln -sf ../SRC_ORCA/*.[Ffh] .;;
-     ( ORCA*LIM | IPSLCM4*  | IPSL_ESM* | ORCA_TOYATM | ORCA*LMD* )
-      [ "${m_n}" = "IPSLCM4_LOOP" ] && \
-       echo " Creation du catalogue OPA/WORK = ORCA + LIM + TRC" || \
-       echo " Creation du catalogue OPA/WORK = ORCA + LIM"
-      ln -sf ../SRC_ORCA/*.[Ffh] .
-      [ "${m_n}" = "IPSLCM4_LOOP" ] && \rm *.passivetrc.h
-      [ "${m_n}" = "IPSLCM4_LOOP" ] && \
-       ln -sf ../SRC_TRC/*.[Ffh] ../SRC_TRC/trc_sms/*.[Ffh] .
-      ln -sf ../SRC_UCL/[a-z]* .;;
-     ( ORCA*_LIM_TRC )
-      echo " Creation du catalogue OPA/WORK = ORCA + LIM + TRC"
-      ln -sf ../SRC_ORCA/*.[Ffh] .
-      \rm *.passivetrc.h
-      ln -sf ../SRC_TRC/*.[Ffh] ../SRC_TRC/trc_sms/*.[Ffh] .
-      ln -sf ../SRC_UCL/[a-z]* .;;
-     ( *LOBSTER1 )
-      echo " Creation du catalogue OPA/WORK = ORCA + TRC"
-      ln -sf ../SRC_ORCA/*.[Ffh] .
-      \rm *.passivetrc.h
-      ln -sf ../SRC_TRC/*.[Ffh] ../SRC_TRC/trc_sms/*.[Ffh] .;;
-     ( ORCA*_OFF_TRC )
-      echo " Creation du catalogue OPA/WORK = TRC + OFFLINE"
-      ln -sf ../SRC_TRC/*.[Ffh] ../SRC_TRC/trc_sms/*.[Ffh] .
-      ln -sf ../SRC_OFFLINE_TRC/*.[Ffh] .;;
-    esac
+    [ "${m_n}" = "IPSLCM4_LOOP" ] && \
+        echo " Creation du catalogue OPA/WORK = ORCA + LIM + TRC" || \
+        echo " Creation du catalogue OPA/WORK = ORCA + LIM"
+    ln -sf ../SRC_ORCA/*.[Ffh] .
+    [ "${m_n}" = "IPSLCM4_LOOP" ] && \rm *.passivetrc.h
+    [ "${m_n}" = "IPSLCM4_LOOP" ] && \
+        ln -sf ../SRC_TRC/*.[Ffh] ../SRC_TRC/trc_sms/*.[Ffh] .
+    ln -sf ../SRC_UCL/[a-z]* .
 #-- Building the standard list of source files
     cat >.patron <<"EOF"
@@ -458 +431 @@
     [ -f "KEY_CPP" ] || echo $KEY > KEY_CPP;
   ;;
-  ( IPSLCM5_LOOP )
-  ../modeles/UTIL/fait_config IPSLCM5_LOOP ;;
-  ( IPSLCM5_v3 )
-  ../modeles/UTIL/fait_config IPSLCM5_v3 ;;
   ( IPSLCM5A )
   ../modeles/UTIL/fait_config IPSLCM5A ;;
@@ -474 +443 @@
   ( IPSLCM5CHT_v5 )
   ../modeles/UTIL/fait_config IPSLCM5CHT_v5 ;;
-  (IPSLCM5* )
-  ../modeles/UTIL/fait_config IPSLCM5 ;;
-  ( IPSL_ESM_v2 )
-  ../modeles/UTIL/fait_config IPSL_ESM_v2 ;;
 esac