Changeset 74

Timestamp:

03/20/09 17:21:46 (15 years ago)

Author:

sdipsl

Message:

AC : new atlas for diaptr (streamfucntion etc ...)

remove so called additional atlas
add NUM_PROC_OCE in libIGCM_sys_platine.ksh

Location:

trunk/libIGCM

Files:

• AA_atlas_ORCA_LIM (modified) (2 diffs)
• AA_create_se (modified) (2 diffs)
• libIGCM_sys/libIGCM_sys_platine.ksh (modified) (1 diff)

trunk/libIGCM/AA_atlas_ORCA_LIM

@@ -131 +131 @@
 done  > ${R_ATLAS}/ICE/allferretscript.txt
 
+# WHILE WAITING FOR A MORE GENERIC SOLUTION
+if [ ${config_UserChoices_TagName} = "IPSLCM5" ] ; then
+    IGCM_sys_Get ${R_OUT_OCE}/Analyse/SE/${config_UserChoices_JobName}_SE_${YEARS}_1M_diaptr.nc  ${RUN_DIR} ;
+    atlas -o ${RUN_DIR}/${R_ATLAS}/ZNL   -d -l ${FER_ATLAS}/atlas_l_${RESOL_OCE}_znl.cfg         ${RUN_DIR}/${config_UserChoices_JobName}_SE_${YEARS}_1M_diaptr.nc ;
+    for file in $( ls ${R_ATLAS}/ZNL/*/*jnl ) ; do
+        echo -e "\n\n################################" ;
+        echo -e "$file\n" ; cat $file ;
+    done
+fi
+
 # Clear some files
 find . \( -name "*.stdout" -o -name "*.jnl" \) -print -exec rm -f {} \;
@@ -140 +150 @@
 IGCM_sys_Rm ${config_UserChoices_JobName}_SE_${YEARS}_1M_grid_[TUVW].nc 
 IGCM_sys_Rm ${config_UserChoices_JobName}_SE_${YEARS}_1M_icemod.nc      
+# WHILE WAITING FOR A MORE GENERIC SOLUTION
+if [ ${config_UserChoices_TagName} = "IPSLCM5" ] ; then
+    IGCM_sys_Rm ${config_UserChoices_JobName}_SE_${YEARS}_1M_diaptr.nc ; 
+fi
 
 # DODS copy

trunk/libIGCM/AA_create_se

@@ -467 +467 @@
 if [ ${config_UserChoices_TagName} = "IPSLCM4_v1_OASIS3" ] || \
    [ ${config_UserChoices_TagName} = "IPSLCM4_v2" ]        || \
-   [ ${config_UserChoices_TagName} = "IPSLCM5" ]           || \
    [ ${config_UserChoices_TagName} = "IPSL_ESM_V1" ] ; then
     #
@@ -475 +474 @@
     IGCM_sys_QsubPost additionnal        ;
     #
+elif [ ${config_UserChoices_TagName} = "IPSLCM5" ] ; then
+    IGCM_sys_QsubPost atlas_ORCHIDEE     ;
+    IGCM_sys_QsubPost atlas_LMDZ         ;
+    IGCM_sys_QsubPost atlas_ORCA_LIM     ;
+    #
 elif [ ${config_UserChoices_TagName} = "LMDZ4OR" ]  || \
      [ ${config_UserChoices_TagName} = "LMDZOR" ]   || \

trunk/libIGCM/libIGCM_sys/libIGCM_sys_platine.ksh

@@ -1349 +1349 @@
     fi
     (( NUM_PROC_ATM = $BATCH_NUM_PROC_TOT - 2 ))
+    (( NUM_PROC_OCE = 1 ))
 
     IGCM_debug_PopStack "IGCM_sys_build_run_file"