Changeset 2713


Ignore:
Timestamp:
2011-03-30T16:46:03+02:00 (10 years ago)
Author:
rblod
Message:

Phasing dynamic memory branch with version 2712 off the trunk

Location:
branches/dev_r2586_dynamic_mem
Files:
3 added
3 edited
46 copied

Legend:

Unmodified
Added
Removed
  • branches/dev_r2586_dynamic_mem/NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/README

    r2528 r2713  
    1 To use these idl tools you need to download some cliatogies and mask files; 
     1To use these idl tools you need to download some climatogies and mask files; 
    22that you can find here: http://dodsp.idris.fr/reee512/NEMO_OUT/ORCA2_LIM/ 
  • branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

    r2707 r2713  
    501501      !                                               !     set a minimum depth     ! 
    502502      !                                               ! =========================== ! 
    503       IF( rn_hmin < 0._wp ) THEN    ;   ik = - INT( rn_hmin )                                      ! from a nb of level 
    504       ELSE                          ;   ik = MINLOC( gdepw_0, mask = gdepw_0 > rn_hmin, dim = 1 )  ! from a depth 
    505       ENDIF 
    506       zhmin = gdepw_0(ik+1)                                                         ! minimum depth = ik+1 w-levels  
    507       WHERE( bathy(:,:) <= 0._wp )   ;   bathy(:,:) = 0._wp                         ! min=0     over the lands 
    508       ELSE WHERE                     ;   bathy(:,:) = MAX(  zhmin , bathy(:,:)  )   ! min=zhmin over the oceans 
    509       END WHERE 
    510       IF(lwp) write(numout,*) 'Minimum ocean depth: ', zhmin, ' minimum number of ocean levels : ', ik 
     503      IF ( .not. ln_sco ) THEN 
     504         IF( rn_hmin < 0._wp ) THEN    ;   ik = - INT( rn_hmin )                                      ! from a nb of level 
     505         ELSE                          ;   ik = MINLOC( gdepw_0, mask = gdepw_0 > rn_hmin, dim = 1 )  ! from a depth 
     506         ENDIF 
     507         zhmin = gdepw_0(ik+1)                                                         ! minimum depth = ik+1 w-levels  
     508         WHERE( bathy(:,:) <= 0._wp )   ;   bathy(:,:) = 0._wp                         ! min=0     over the lands 
     509         ELSE WHERE                     ;   bathy(:,:) = MAX(  zhmin , bathy(:,:)  )   ! min=zhmin over the oceans 
     510         END WHERE 
     511         IF(lwp) write(numout,*) 'Minimum ocean depth: ', zhmin, ' minimum number of ocean levels : ', ik 
     512      ENDIF 
    511513      ! 
    512514   END SUBROUTINE zgr_bat 
  • branches/dev_r2586_dynamic_mem/NEMOGCM/SETTE/fcm_job.sh

    r2678 r2713  
    103103echo "list of cpp_keys: " >> ${SETTE_DIR}/output.sette 
    104104echo "`more ../CONFIG/${NEW_CONF}/cpp_${NEW_CONF}.fcm`" >> ${SETTE_DIR}/output.sette 
     105echo "" >> ${SETTE_DIR}/output.sette 
     106echo "compiling with: ${CMP_NAM}" >> ${SETTE_DIR}/output.sette 
    105107echo "" >> ${SETTE_DIR}/output.sette 
    106108echo "executing script : \"fcm_job $@\" " >> ${SETTE_DIR}/output.sette 
     
    208210   echo "some problems with svn info command" 
    209211   echo "some problems with svn info command" >> ${SETTE_DIR}/output.sette 
    210    ${REVISION_NB}=`date +%Y%m%d` 
     212   REVISION_NB=`date +%Y%m%d` 
    211213   echo "put in ${REVISION_NB} date" 
    212214   echo "put in ${REVISION_NB} date" >> ${SETTE_DIR}/output.sette 
     
    228230[ -f ${OUTPUT_DIR}/*solver.stat ] && mv ${OUTPUT_DIR}/*solver.stat ${NEMO_VALID}/. 
    229231[ -n "`ls ${OUTPUT_DIR}/*restart*`" ] && mv ${OUTPUT_DIR}/*restart* ${NEMO_VALID}/. 
     232[ -f ${OUTPUT_DIR}/ice_evolu ] && mv ${OUTPUT_DIR}/ice_evolu ${NEMO_VALID}/. 
    230233if [ -n "$(ls ${NEMO_VALID}/*solver*)" ] ; then 
    231234   echo "moved solver.stat in ${NEMO_VALID} directory"  >> ${SETTE_DIR}/output.sette 
     
    249252   echo "restart files ARE NOT in ${NEMO_VALID} directory"  
    250253fi 
    251 ################################################################ 
     254if [ -n "$(ls ${NEMO_VALID}/ice_evolu)" ] ; then 
     255        echo "moved ice_evolu in ${NEMO_VALID} directory"  >> ${SETTE_DIR}/output.sette 
     256        echo "moved ice_evolu in ${NEMO_VALID} directory" 
     257else 
     258        echo "problem looking for ice_evolu file in ${NEMO_VALID} directory"  >> ${SETTE_DIR}/output.sette 
     259        echo "ice_evolu IS NOT in ${NEMO_VALID} directory" 
     260fi 
     261################################################################ 
Note: See TracChangeset for help on using the changeset viewer.