Changeset 9576


Ignore:
Timestamp:
2018-05-11T16:50:48+02:00 (2 years ago)
Author:
nicolasmartin
Message:

Global renaming for SETTE + fix for key_lim3 in MY_SRC: push remaining modifications in order to start from a clean checkout

Location:
branches/2017/dev_merge_2017/NEMOGCM
Files:
37 edited
3 moved

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SPITZ12/MY_SRC/sbcblk.F90

    r9552 r9576  
    4545   USE sbc_ice        ! Surface boundary condition: ice fields 
    4646   USE lib_fortran    ! to use key_nosignedzero 
    47 #if defined key_lim3 
     47#if defined key_si3 
    4848   USE ice     , ONLY :   u_ice, v_ice, jpl, a_i_b, at_i_b, tm_su, rn_cnd_s 
    4949   USE icethd_dh      ! for CALL ice_thd_snwblow 
     
    6565   PUBLIC   sbc_blk_init  ! called in sbcmod 
    6666   PUBLIC   sbc_blk       ! called in sbcmod 
    67 #if defined key_lim3 
     67#if defined key_si3 
    6868   PUBLIC   blk_ice_tau   ! routine called in iceforcing 
    6969   PUBLIC   blk_ice_flx   ! routine called in iceforcing 
     
    539539         &     * ( MIN( sf(jp_tair)%fnow(:,:,1), rt0_snow ) - rt0 ) * cpic * tmask(:,:,1) 
    540540      ! 
    541 #if defined key_lim3 
     541#if defined key_si3 
    542542      qns_oce(:,:) = zqlw(:,:) - zqsb(:,:) - zqla(:,:)                                ! non solar without emp (only needed by LIM3) 
    543543      qsr_oce(:,:) = qsr(:,:) 
     
    690690   END FUNCTION L_vap 
    691691 
    692 #if defined key_lim3 
     692#if defined key_si3 
    693693   !!---------------------------------------------------------------------- 
    694    !!   'key_lim3'                                       ESIM sea-ice model 
     694   !!   'key_si3'                                       ESIM sea-ice model 
    695695   !!---------------------------------------------------------------------- 
    696696   !!   blk_ice_tau : provide the air-ice stress 
  • branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/CANAL/MY_SRC/diawri.F90

    r9403 r9576  
    5151   USE ioipsl         !  
    5252 
    53 #if defined key_lim3 
     53#if defined key_si3 
    5454   USE icewri  
    5555#endif 
     
    10761076      ENDIF 
    10771077 
    1078 #if defined key_lim3 
     1078#if defined key_si3 
    10791079      IF( nn_ice == 2 ) THEN   ! condition needed in case agrif + ice-model but no-ice in child grid 
    10801080         CALL ice_wri_state( kt, id_i, nh_i ) 
  • branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/bdyini.F90

    r9168 r9576  
    344344        IF(lwp) WRITE(numout,*) 
    345345 
    346 #if defined key_lim3 
     346#if defined key_si3 
    347347        IF(lwp) WRITE(numout,*) 'Boundary conditions for sea ice:  ' 
    348348        SELECT CASE( cn_ice_lim(ib_bdy) )                   
  • branches/2017/dev_merge_2017/NEMOGCM/CONFIG/cfg.txt

    r9575 r9576  
    1515ORCA2_SAS_SI3_ST OCE_SRC ICE_SRC NST_SRC SAS_SRC 
    1616ORCA2_SI3_OBS_ST OCE_SRC ICE_SRC 
     17AGRIF_NORDIC_ST OCE_SRC ICE_SRC NST_SRC 
     18AGRIF_NORDIC_NOAGRIF_ST OCE_SRC ICE_SRC NST_SRC 
     19SPITZ12_ST OCE_SRC ICE_SRC 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ALTIX_NAUTILUS_MPT

    • Property svn:executable deleted
    r8468 r9576  
    8484#  Run the parallel MPI executable  
    8585# 
    86   echo "Running time ${MPT_HOME}/bin/mpiexec_mpt -np " $OCEANCORES " ./opa" 
     86  echo "Running time ${MPT_HOME}/bin/mpiexec_mpt -np " $OCEANCORES " ./nemo" 
    8787# 
    88   time ${MPT_HOME}/bin/mpiexec_mpt -np $OCEANCORES ./opa 
     88  time ${MPT_HOME}/bin/mpiexec_mpt -np $OCEANCORES ./nemo 
    8989# 
    9090  post_test_tidyup 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-IBM_EKMAN_INGV

    • Property svn:executable deleted
    r8468 r9576  
    3030 export MP_SHARED_MEMORY=yes 
    3131 export MPIRUN="mpirun -n $OCEANCORES" 
    32  export MPIRUN_MPMD="mpirun -np $OCEANCORES ./opa : -np $XIOS_NUMPROCS /home/delrosso/XIOS_1.0/xios-1.0/bin/xios_server.exe" 
     32 export MPIRUN_MPMD="mpirun -np $OCEANCORES ./nemo : -np $XIOS_NUMPROCS /home/delrosso/XIOS_1.0/xios-1.0/bin/xios_server.exe" 
    3333 
    3434# 
     
    6969#  Run the parallel MPI executable  
    7070# 
    71 #  echo "Running time ${MPIRUN} " $OCEANCORES " ./opa" 
     71#  echo "Running time ${MPIRUN} " $OCEANCORES " ./nemo" 
    7272# 
    7373 
    7474  if [ MPI_FLAG == "yes" ]; then 
    7575     if [ $XIOS_NUMPROCS -eq 0 ]; then 
    76        time ${MPIRUN} ./opa 
     76       time ${MPIRUN} ./nemo 
    7777     else 
    7878       time ${MPIRUN_MPMD} 
    7979     fi 
    8080  else 
    81        time ./opa 
     81       time ./nemo 
    8282  fi 
    8383# 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-PW6_CALYPSO

    • Property svn:executable deleted
    r8468 r9576  
    6565#  Run the parallel MPI executable  
    6666# 
    67 #  echo "Running time ${MPIRUN} " $OCEANCORES " ./opa" 
     67#  echo "Running time ${MPIRUN} " $OCEANCORES " ./nemo" 
    6868# 
    6969 
    7070  if [ MPI_FLAG == "yes" ]; then 
    71      time ${MPIRUN} ./opa 
     71     time ${MPIRUN} ./nemo 
    7272  else 
    73      time ./opa 
     73     time ./nemo 
    7474  fi 
    7575# 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-PW7_METO

    • Property svn:executable deleted
    r8468 r9576  
    7171  if [ MPI_FLAG == "yes" ]; then 
    7272     n=1 
    73      echo "./opa" > ./alltasks 
     73     echo "./nemo" > ./alltasks 
    7474     while [ $n -lt $OCEANCORES ] 
    7575     do 
    76        echo "./opa" >> ./alltasks 
     76       echo "./nemo" >> ./alltasks 
    7777       n=$(( $n + 1 )) 
    7878     done 
    7979     time ${MPIRUN} ./alltasks 
    8080  else 
    81      time ./opa 
     81     time ./nemo 
    8282  fi 
    8383 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-PW7_MONSOON

    • Property svn:executable deleted
    r8468 r9576  
    7070  if [ MPI_FLAG == "yes" ]; then 
    7171     n=1 
    72      echo "./opa" > ./alltasks 
     72     echo "./nemo" > ./alltasks 
    7373     while [ $n -lt $OCEANCORES ] 
    7474     do 
    75        echo "./opa" >> ./alltasks 
     75       echo "./nemo" >> ./alltasks 
    7676       n=$(( $n + 1 )) 
    7777     done 
    7878     time ${MPIRUN} ./alltasks 
    7979  else 
    80      time ./opa 
     80     time ./nemo 
    8181  fi 
    8282 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_ADA

    r8468 r9576  
    6363#  Run the parallel MPI executable  
    6464# 
    65 #  echo "Running time ${MPIRUN} ./opa" 
     65#  echo "Running time ${MPIRUN} ./nemo" 
    6666# 
    6767  if [ MPI_FLAG == "yes" ]; then 
    68      echo "Running time ${MPIRUN} ./opa -procs $OCEANCORES" 
    69      time ${MPIRUN} ./opa -procs $OCEANCORES 
     68     echo "Running time ${MPIRUN} ./nemo -procs $OCEANCORES" 
     69     time ${MPIRUN} ./nemo -procs $OCEANCORES 
    7070  else 
    71      echo "Running time ./opa" 
    72      time ./opa 
     71     echo "Running time ./nemo" 
     72     time ./nemo 
    7373  fi 
    7474 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_ADA_DEBUG

    • Property svn:executable deleted
    r8468 r9576  
    6363#  Run the parallel MPI executable  
    6464# 
    65 #  echo "Running time ${MPIRUN} ./opa" 
     65#  echo "Running time ${MPIRUN} ./nemo" 
    6666# 
    6767  if [ MPI_FLAG == "yes" ]; then 
    68      echo "Running time ${MPIRUN} ./opa -procs $OCEANCORES" 
    69      time ${MPIRUN} ./opa -procs $OCEANCORES 
     68     echo "Running time ${MPIRUN} ./nemo -procs $OCEANCORES" 
     69     time ${MPIRUN} ./nemo -procs $OCEANCORES 
    7070  else 
    71      echo "Running time ./opa" 
    72      time ./opa 
     71     echo "Running time ./nemo" 
     72     time ./nemo 
    7373  fi 
    7474 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_ADA_O0

    • Property svn:executable deleted
    r8468 r9576  
    6464#  Run the parallel MPI executable  
    6565# 
    66 #  echo "Running time ${MPIRUN} ./opa" 
     66#  echo "Running time ${MPIRUN} ./nemo" 
    6767# 
    6868  if [ MPI_FLAG == "yes" ]; then 
    69      echo "Running time ${MPIRUN} ./opa -procs $OCEANCORES" 
    70      time ${MPIRUN} ./opa  -procs $OCEANCORES 
     69     echo "Running time ${MPIRUN} ./nemo -procs $OCEANCORES" 
     70     time ${MPIRUN} ./nemo  -procs $OCEANCORES 
    7171  else 
    72      echo "Running time ./opa" 
    73      time ./opa 
     72     echo "Running time ./nemo" 
     73     time ./nemo 
    7474  fi 
    7575 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_CURIE

    • Property svn:executable deleted
    r8468 r9576  
    6464#  Run the parallel MPI executable  
    6565# 
    66   echo "Running time ${MPIRUN} ./opa" 
     66  echo "Running time ${MPIRUN} ./nemo" 
    6767# 
    6868  if [ MPI_FLAG == "yes" ]; then 
    69      time ${MPIRUN} ./opa 
     69     time ${MPIRUN} ./nemo 
    7070  else 
    71      time ./opa 
     71     time ./nemo 
    7272  fi 
    7373 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_MOBILIS

    • Property svn:executable deleted
    r9442 r9576  
    6262       echo time `which mpirun` --report-bindings -x MALLOC_MMAP_MAX_=-1                 \ 
    6363                                -x MALLOC_TRIM_THRESHOLD_=33554432 -np $OCORES --bynode  \ 
    64                                 --mca mpi_paffinity_alone 1 ./opa  
     64                                --mca mpi_paffinity_alone 1 ./nemo  
    6565            time `which mpirun` --report-bindings -x MALLOC_MMAP_MAX_=-1                 \ 
    6666                                -x MALLOC_TRIM_THRESHOLD_=33554432 -np $OCORES --bynode  \ 
    67                                 --mca mpi_paffinity_alone 1 ./opa  
     67                                --mca mpi_paffinity_alone 1 ./nemo  
    6868  else 
    6969       if [ ! -f ./xios_server.exe ] && [ -f ${XIO_HOME}/bin/xios_server.exe ]; then 
     
    8181                                -x MALLOC_TRIM_THRESHOLD_=33554432       \ 
    8282                                -np $XCORES ./xios_server.exe            \ 
    83                               : -np $OCORES --bynode  --mca mpi_paffinity_alone 1 ./opa  
     83                              : -np $OCORES --bynode  --mca mpi_paffinity_alone 1 ./nemo  
    8484# 
    8585            time `which mpirun` --report-bindings -x MALLOC_MMAP_MAX_=-1 \ 
    8686                                -x MALLOC_TRIM_THRESHOLD_=33554432       \ 
    8787                                -np $XCORES ./xios_server.exe            \ 
    88                               : -np $OCORES --bynode  --mca mpi_paffinity_alone 1 ./opa  
     88                              : -np $OCORES --bynode  --mca mpi_paffinity_alone 1 ./nemo  
    8989# 
    9090  fi 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-XC40_METO

    • Property svn:executable deleted
    r8468 r9576  
    7171        exit 
    7272     fi 
    73        echo time aprun -b -n $XCORES -N $X_PER_NODE ./xios_server.exe : -n $OCORES -N $O_PER_NODE ./opa 
    74             time aprun -b -n $XCORES -N $X_PER_NODE ./xios_server.exe : -n $OCORES -N $O_PER_NODE ./opa 
     73       echo time aprun -b -n $XCORES -N $X_PER_NODE ./xios_server.exe : -n $OCORES -N $O_PER_NODE ./nemo 
     74            time aprun -b -n $XCORES -N $X_PER_NODE ./xios_server.exe : -n $OCORES -N $O_PER_NODE ./nemo 
    7575# 
    7676  else 
     
    7878# Run SPMD case 
    7979# 
    80     echo time aprun -b  -n $OCORES -N $O_PER_NODE ./opa 
    81          time aprun -b  -n $OCORES -N $O_PER_NODE ./opa 
     80    echo time aprun -b  -n $OCORES -N $O_PER_NODE ./nemo 
     81         time aprun -b  -n $OCORES -N $O_PER_NODE ./nemo 
    8282  fi 
    8383# 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-XC_ARCHER_INTEL

    • Property svn:executable deleted
    r8468 r9576  
    7171# Run SPMD case 
    7272# 
    73        echo time aprun -b  -n $OCORES -N $O_PER_NODE ./opa 
    74             time aprun -b  -n $OCORES -N $O_PER_NODE ./opa 
     73       echo time aprun -b  -n $OCORES -N $O_PER_NODE ./nemo 
     74            time aprun -b  -n $OCORES -N $O_PER_NODE ./nemo 
    7575  else 
    7676       if [ ! -f ./xios_server.exe ] && [ -f ${XIO_HOME}/bin/xios_server.exe ]; then 
     
    8585#  Run MPMD case 
    8686# 
    87        echo time aprun -b -n $XCORES -N $X_PER_NODE ./xios_server.exe : -n $OCORES -N $O_PER_NODE ./opa 
    88             time aprun -b -n $XCORES -N $X_PER_NODE ./xios_server.exe : -n $OCORES -N $O_PER_NODE ./opa 
     87       echo time aprun -b -n $XCORES -N $X_PER_NODE ./xios_server.exe : -n $OCORES -N $O_PER_NODE ./nemo 
     88            time aprun -b -n $XCORES -N $X_PER_NODE ./xios_server.exe : -n $OCORES -N $O_PER_NODE ./nemo 
    8989# 
    9090  fi 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_athena

    • Property svn:executable deleted
    r8468 r9576  
    6565#  Run the parallel MPI executable  
    6666# 
    67 #  echo "Running time ${MPIRUN} " $OCEANCORES " ./opa" 
     67#  echo "Running time ${MPIRUN} " $OCEANCORES " ./nemo" 
    6868# 
    6969 
    7070  if [ MPI_FLAG == "yes" ]; then 
    71      time ${MPIRUN} ./opa 
     71     time ${MPIRUN} ./nemo 
    7272  else 
    73      time ./opa 
     73     time ./nemo 
    7474  fi 
    7575# 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_athena_xios

    • Property svn:executable deleted
    r8468 r9576  
    7171#  Run the parallel MPI executable  
    7272# 
    73 #  echo "Running time ${MPIRUN} " $OCEANCORES " ./opa" 
     73#  echo "Running time ${MPIRUN} " $OCEANCORES " ./nemo" 
    7474# 
    7575 
    7676  if [ MPI_FLAG == "yes" ]; then 
    7777     if [ $XIOS_NUMPROCS -eq 0 ]; then 
    78        time ${MPIRUN} ./opa 
     78       time ${MPIRUN} ./nemo 
    7979     else 
    8080 
     
    8585       k=0 
    8686       while (( k < $OCEANCORES )) ; do 
    87           echo ./opa >> xioscmdfile 
     87          echo ./nemo >> xioscmdfile 
    8888          k=`expr $k + 1` 
    8989       done 
     
    9797     fi 
    9898  else 
    99      time ./opa 
     99     time ./nemo 
    100100  fi 
    101101# 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-macport_osx

    r8468 r9576  
    6666# 
    6767  if [ MPI_FLAG == "yes" ]; then 
    68   echo "Running time ${MPIRUN} ./opa" 
    69      time ${MPIRUN} ./opa 
     68  echo "Running time ${MPIRUN} ./nemo" 
     69     time ${MPIRUN} ./nemo 
    7070  else 
    71   echo "Running time./opa" 
    72      time ./opa 
     71  echo "Running time./nemo" 
     72     time ./nemo 
    7373  fi 
    7474 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-macport_osx_debug

    r8468 r9576  
    6666# 
    6767  if [ MPI_FLAG == "yes" ]; then 
    68   echo "Running time ${MPIRUN} ./opa" 
    69      time ${MPIRUN} ./opa 
     68  echo "Running time ${MPIRUN} ./nemo" 
     69     time ${MPIRUN} ./nemo 
    7070  else 
    71   echo "Running time./opa" 
    72      time ./opa 
     71  echo "Running time./nemo" 
     72     time ./nemo 
    7373  fi 
    7474 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-mpmd-ALTIX_NAUTILUS_MPT

    • Property svn:executable deleted
    r8468 r9576  
    9797#  Run the parallel MPI executable  
    9898# 
    99   echo "Running time ${MPT_HOME}/bin/mpiexec_mpt -np " $XIOCORES " ./xios_server.exe : -np " $OCEANCORES " ./opa" 
     99  echo "Running time ${MPT_HOME}/bin/mpiexec_mpt -np " $XIOCORES " ./xios_server.exe : -np " $OCEANCORES " ./nemo" 
    100100# 
    101   time ${MPT_HOME}/bin/mpiexec_mpt -np $XIOCORES ./xios_server.exe :  -np $OCEANCORES ./opa 
     101  time ${MPT_HOME}/bin/mpiexec_mpt -np $XIOCORES ./xios_server.exe :  -np $OCEANCORES ./nemo 
    102102# 
    103103  post_test_tidyup 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-openmpi_KARA_MERCATOR_XIOS

    • Property svn:executable deleted
    r9480 r9576  
    5858#  Run the parallel MPI executable  
    5959# 
    60   echo "Running time ${MPIRUN} ./opa" 
     60  echo "Running time ${MPIRUN} ./nemo" 
    6161# 
    6262  if [ MPI_FLAG == "yes" ]; then 
    63      mpirun -np $OCEANCORES ./opa 
     63     mpirun -np $OCEANCORES ./nemo 
    6464  else 
    65      time ./opa 
     65     time ./nemo 
    6666  fi 
    6767 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-openmpi_NAVITI_MERCATOR

    • Property svn:executable deleted
    r8469 r9576  
    5858#  Run the parallel MPI executable  
    5959# 
    60   echo "Running time ${MPIRUN} ./opa" 
     60  echo "Running time ${MPIRUN} ./nemo" 
    6161# 
    6262  if [ MPI_FLAG == "yes" ]; then 
    63      mpirun -np $OCEANCORES ./opa 
     63     mpirun -np $OCEANCORES ./nemo 
    6464  else 
    65      time ./opa 
     65     time ./nemo 
    6666  fi 
    6767 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/sette_batch_template

    • Property svn:executable deleted
    r8468 r9576  
    6666# 
    6767  if [ MPI_FLAG == "yes" ]; then 
    68   echo "Running time ${MPIRUN} ./opa" 
    69      time ${MPIRUN} ./opa 
     68  echo "Running time ${MPIRUN} ./nemo" 
     69     time ${MPIRUN} ./nemo 
    7070  else 
    71   echo "Running time./opa" 
    72      time ./opa 
     71  echo "Running time./nemo" 
     72     time ./nemo 
    7373  fi 
    7474 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/all_functions.sh

    r9534 r9576  
    412412 
    413413 
    414         [ -f ${EXE_DIR}/field_def_nemo-opa.xml ] || sed -i '/field_def_nemo-opa/d' $1 
    415         [ -f ${EXE_DIR}/field_def_nemo-lim.xml ] || sed -i '/field_def_nemo-lim/d' $1 
     414        [ -f ${EXE_DIR}/field_def_nemo-oce.xml ] || sed -i '/field_def_nemo-oce/d' $1 
     415        [ -f ${EXE_DIR}/field_def_nemo-ice.xml ] || sed -i '/field_def_nemo-ice/d' $1 
    416416        [ -f ${EXE_DIR}/field_def_nemo-pisces.xml ] || sed -i '/field_def_nemo-pisces/d' $1 
    417417 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/input_AGRIF.cfg

    r9483 r9576  
    1 ORCA2_LIM_nemo_v3.7.tar ORCA2_LIM_nemo_v3.7 
     1ORCA2_ICE_nemo_v3.7.tar ORCA2_ICE_nemo_v3.7 
    22AGRIF_NORDIC_v4.0.tar AGRIF_NORDIC_v4.0 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/input_ORCA2_SI3_AGRIF.cfg

    r9565 r9576  
    1 ORCA2_LIM_nemo_v3.7.tar ORCA2_LIM_nemo_v3.7 
     1ORCA2_ICE_nemo_v3.7.tar ORCA2_ICE_nemo_v3.7 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/input_ORCA2_SI3_OBS.cfg

    r9565 r9576  
    1 ORCA2_LIM_nemo_v3.7.tar ORCA2_LIM_nemo_v3.7 
     1ORCA2_ICE_nemo_v3.7.tar ORCA2_ICE_nemo_v3.7 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/input_ORCA2_SI3_PISCES.cfg

    r9565 r9576  
    1 ORCA2_LIM_nemo_v3.7.tar  ORCA2_LIM_PISCES_v3.7 
     1ORCA2_ICE_nemo_v3.7.tar  ORCA2_ICE_PISCES_v3.7 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/input_SAS.cfg

    r7646 r9576  
    1 ORCA2_LIM_nemo_v3.7.tar ORCA2_LIM_nemo_v3.7 
     1ORCA2_ICE_nemo_v3.7.tar ORCA2_ICE_nemo_v3.7 
    22INPUTS_SAS_v3.5.tar SAS  
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/iodef_sette.xml

    • Property svn:executable deleted
    r7715 r9576  
    1212============================================================================================================ 
    1313    --> 
    14     <field_definition src="DEF_SHARED/field_def_nemo-opa.xml"/> 
    15     <field_definition src="DEF_SHARED/field_def_nemo-lim.xml"/> 
     14    <field_definition src="DEF_SHARED/field_def_nemo-oce.xml"/> 
     15    <field_definition src="DEF_SHARED/field_def_nemo-ice.xml"/> 
    1616    <field_definition src="DEF_SHARED/field_def_nemo-pisces.xml"/> 
    1717    <!--  
     
    165165============================================================================================================ 
    166166    --> 
    167     <field_definition src="DEF_SHARED/field_def_nemo-opa.xml"/> 
    168     <field_definition src="DEF_SHARED/field_def_nemo-lim.xml"/> 
     167    <field_definition src="DEF_SHARED/field_def_nemo-oce.xml"/> 
     168    <field_definition src="DEF_SHARED/field_def_nemo-ice.xml"/> 
    169169    <field_definition src="DEF_SHARED/field_def_nemo-pisces.xml"/> 
    170170    <!--  
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/param.cfg

    r9161 r9576  
    11#- forcing files storing 
    2 FORCING_DIR=~/FORCING 
     2FORCING_DIR=$WORKDIR/NEMO/FORC 
    33#- input files storing 
    44INPUT_DIR=${CONFIG_DIR}/${NEW_CONF}/EXP00 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/prepare_job.sh

    r9480 r9576  
    155155# RUN OPA 
    156156cd ${EXE_DIR} 
    157 if [ ! -r ${EXE_DIR}/opa ] 
     157if [ ! -r ${EXE_DIR}/nemo ] 
    158158    then 
    159     echo "executable opa does not exist" 
    160     echo "executable opa does not exist, exit"  >> ${SETTE_DIR}/output.sette 
     159    echo "executable nemo does not exist" 
     160    echo "executable nemo does not exist, exit"  >> ${SETTE_DIR}/output.sette 
    161161    exit 1 
    162162fi 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette.sh

    r9560 r9576  
    4242# 
    4343#  makenemo  : to create successive exectuables in ${CONFIG_NAME}/BLD/bin/nemo.exe  
    44 #              and links to opa in ${CONFIG_NAME}/EXP00) 
     44#              and links to nemo in ${CONFIG_NAME}/EXP00) 
    4545# 
    4646#  param.cfg : sets and loads following directories: 
     
    134134# Description of configuration tested: 
    135135# GYRE_PISCES       :  1  
    136 # ORCA2_LIM3_PISCES :  2  
     136# ORCA2_SI3_PISCES :  2  
    137137# ORCA2_OFF_PISCES  :  3  
    138138# AMM12             :  4  
    139139# SAS               :  5 
    140 # ORCA2_LIM3_OBS    :  6 
     140# ORCA2_SI3_OBS     :  6 
    141141# AGRIF             :  7 & 8  test AGRIF in a double zoom configuration (AGRIF_NORDIC) 
    142142#                               and check that key_agrif without zoom = no key_agrif 
    143143# SPITZ12           :  9      regional configuration including sea-ice and tides (Spitzbergen) 
    144144 
    145 for config in 1 2 3 4 5 6 7 8 9  
     145#for config in 1 2 3 4 5 6 7 8 9 
     146for config in 9 
    146147do 
    147148 
     
    272273 
    273274# ----------------- 
    274 # ORCA2_LIM3_PISCES 
     275# ORCA2_SI3_PISCES 
    275276# ----------------- 
    276277if [ ${config} -eq 2 ] ;  then 
    277 ## Restartability tests for ORCA2_LIM3_PISCES 
     278## Restartability tests for ORCA2_SI3_PISCES 
    278279    export TEST_NAME="LONG" 
    279280    cd ${CONFIG_DIR0} 
    280     . ./makenemo -m ${CMP_NAM} -n ORCA2_LIM3_PISCES_ST -r ORCA2_LIM3_PISCES -j 8 del_key ${DEL_KEYS} 
     281    . ./makenemo -m ${CMP_NAM} -n ORCA2_SI3_PISCES_ST -r ORCA2_SI3_PISCES -j 8 del_key ${DEL_KEYS} 
    281282    cd ${SETTE_DIR} 
    282283    . ./param.cfg 
     
    315316    fi 
    316317    cd ${SETTE_DIR} 
    317     . ./prepare_job.sh input_ORCA2_LIM3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     318    . ./prepare_job.sh input_ORCA2_SI3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    318319     
    319320    cd ${SETTE_DIR} 
     
    362363    fi 
    363364    cd ${SETTE_DIR} 
    364     . ./prepare_job.sh input_ORCA2_LIM3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    365     cd ${SETTE_DIR} 
    366     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    367  
    368 ## Reproducibility tests for ORCA2_LIM3_PISCES 
     365    . ./prepare_job.sh input_ORCA2_SI3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     366    cd ${SETTE_DIR} 
     367    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     368 
     369## Reproducibility tests for ORCA2_SI3_PISCES 
    369370    export TEST_NAME="REPRO_4_8" 
    370371    cd ${CONFIG_DIR0} 
     
    403404    fi 
    404405    cd ${SETTE_DIR} 
    405     . ./prepare_job.sh input_ORCA2_LIM3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     406    . ./prepare_job.sh input_ORCA2_SI3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    406407    cd ${SETTE_DIR} 
    407408    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     
    440441    fi 
    441442    cd ${SETTE_DIR} 
    442     . ./prepare_job.sh input_ORCA2_LIM3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     443    . ./prepare_job.sh input_ORCA2_SI3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    443444    cd ${SETTE_DIR} 
    444445    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     
    729730    export TEST_NAME="LONG" 
    730731    cd ${CONFIG_DIR0} 
    731     . ./makenemo -m ${CMP_NAM} -n ORCA2_SAS_LIM3_ST -r ORCA2_SAS_LIM3 -j 8 del_key ${DEL_KEYS} 
     732    . ./makenemo -m ${CMP_NAM} -n ORCA2_SAS_SI3_ST -r ORCA2_SAS_SI3 -j 8 del_key ${DEL_KEYS} 
    732733    cd ${SETTE_DIR} 
    733734    . ./param.cfg 
     
    839840 
    840841# -------------- 
    841 # ORCA2_LIM3_OBS 
     842# ORCA2_SI3_OBS 
    842843# -------------- 
    843844## Test assimilation interface code, OBS and ASM for reproducibility 
     
    847848    export TEST_NAME="REPRO_4_8" 
    848849    cd ${CONFIG_DIR0} 
    849     . ./makenemo -m ${CMP_NAM} -n ORCA2_LIM3_OBS_ST -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3"  -j 8 add_key "key_asminc" del_key "key_top" 
     850    . ./makenemo -m ${CMP_NAM} -n ORCA2_SI3_OBS_ST -r ORCA2_SI3_PISCES -d "OCE_SRC ICE_SRC"  -j 8 add_key "key_asminc" del_key "key_top" 
    850851    cd ${SETTE_DIR} 
    851852    . ./param.cfg 
     
    875876    set_namelist namelist_cfg ln_sshinc .true. 
    876877    set_namelist namelist_cfg ln_asmiau .true. 
    877     #remove all useless options for pisces (due to ORCA2_LIM3_PISCES reference configuration) 
     878    #remove all useless options for pisces (due to ORCA2_SI3_PISCES reference configuration) 
    878879    set_namelist namelist_top_cfg ln_trcdta .false.  
    879880    # put ln_ironsed, ln_river, ln_ndepo, ln_dust to false 
     
    894895    fi 
    895896    cd ${SETTE_DIR} 
    896     . ./prepare_job.sh input_ORCA2_LIM3_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     897    . ./prepare_job.sh input_ORCA2_SI3_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    897898    cd ${SETTE_DIR} 
    898899    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     
    924925    set_namelist namelist_cfg ln_sshinc .true. 
    925926    set_namelist namelist_cfg ln_asmiau .true. 
    926     #remove all useless options for pisces (due to ORCA2_LIM3_PISCES reference configuration) 
     927    #remove all useless options for pisces (due to ORCA2_SI3_PISCES reference configuration) 
    927928    set_namelist namelist_top_cfg ln_trcdta .false. 
    928929    # put ln_ironsed, ln_river, ln_ndepo, ln_dust to false 
     
    943944    fi 
    944945    cd ${SETTE_DIR} 
    945     . ./prepare_job.sh input_ORCA2_LIM3_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     946    . ./prepare_job.sh input_ORCA2_SI3_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    946947    cd ${SETTE_DIR} 
    947948    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_beginner.sh

    r9019 r9576  
    4141# 
    4242#  makenemo  : to create successive exectuables in ${CONFIG_NAME}/BLD/bin/nemo.exe  
    43 #              and links to opa in ${CONFIG_NAME}/EXP00) 
     43#              and links to nemo in ${CONFIG_NAME}/EXP00) 
    4444# 
    4545#  param.cfg : sets and loads following directories: 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_chk_result.sh

    r9368 r9576  
    489489# Restartability test 
    490490# 
    491  for restart_test in WGYREPIS_ST WORCA2LIM3PIS_ST WORCA2OFFPIS_ST WAMM12_ST WISOMIP_ST WORCA2AGR_ST 
     491 for restart_test in WGYREPIS_ST WORCA2SI3PIS_ST WORCA2OFFPIS_ST WAMM12_ST WISOMIP_ST WORCA2AGR_ST 
    492492 do 
    493493   resttest $NEMO_VALID $restart_test $pass 
     
    496496# Reproducibility tests 
    497497# 
    498  for repro_test in WGYREPIS_ST WORCA2LIM3PIS_ST WORCA2OFFPIS_ST WAMM12_ST WISOMIP_ST WORCA2_LIM3_OBS_ST WORCA2AGR_ST 
     498 for repro_test in WGYREPIS_ST WORCA2SI3PIS_ST WORCA2OFFPIS_ST WAMM12_ST WISOMIP_ST WORCA2_SI3_OBS_ST WORCA2AGR_ST 
    499499 do 
    500500   reprotest $NEMO_VALID $repro_test $pass 
     
    516516   echo 'and' 
    517517   echo "$NEMO_VALID_REF at rev $NEMO_REV_REF" 
    518    for repro_test in WGYREPIS_ST WORCA2LIM3PIS_ST WORCA2OFFPIS_ST WAMM12_ST WISOMIP_ST WORCA2_LIM3_OBS_ST WORCA2AGR_ST 
     518   for repro_test in WGYREPIS_ST WORCA2SI3PIS_ST WORCA2OFFPIS_ST WAMM12_ST WISOMIP_ST WORCA2_SI3_OBS_ST WORCA2AGR_ST 
    519519   do 
    520520     runcmpres $NEMO_VALID $repro_test $NEMO_VALID_REF $NEMO_REV_REF $pass 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_rpt.SAS.sh

    r9019 r9576  
    302302# Restartability test 
    303303# 
    304  for restart_test in WGYREPIS_LONG WORCA2LIM3PIS_LONG WORCA2OFFPIS_LONG WAMM12_LONG WISOMIP_LONG WORCA2AGUL_LONG 
     304 for restart_test in WGYREPIS_LONG WORCA2SI3PIS_LONG WORCA2OFFPIS_LONG WAMM12_LONG WISOMIP_LONG WORCA2AGUL_LONG 
    305305 do 
    306306   resttest $NEMO_VALID $restart_test $pass 
     
    309309# Reproducibility tests 
    310310# 
    311  for repro_test in WGYREPIS_32 WORCA2LIM3PIS_32 WORCA2OFFPIS_32 WAMM12_32 WISOMIP_32 WORCA2_LIM3_OBS WORCA2AGUL_1_2 WORCA2AGUL_16 WORCA2AGUL_2_2_NAG 
     311 for repro_test in WGYREPIS_32 WORCA2SI3PIS_32 WORCA2OFFPIS_32 WAMM12_32 WISOMIP_32 WORCA2_SI3_OBS WORCA2AGUL_1_2 WORCA2AGUL_16 WORCA2AGUL_2_2_NAG 
    312312 do 
    313313   reprotest $NEMO_VALID $repro_test $pass 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_rpt.sh

    r9553 r9576  
    3535    cd ${TOOLS_DIR}/REBUILD_NEMO 
    3636    #SF echo "REBUILD LONG restart SAS files, without standard output" 
    37     ./rebuild_nemo -t 4 ../../CONFIG/ORCA2_SAS_LIM3_ST/LONG/SAS_00000240_restart_ice  $NPROC > /dev/null 2>&1 
     37    ./rebuild_nemo -t 4 ../../CONFIG/ORCA2_SAS_SI3_ST/LONG/SAS_00000240_restart_ice  $NPROC > /dev/null 2>&1 
    3838    #SF echo "REBUILD SHORT restart SAS files, without standard output" 
    39     ./rebuild_nemo -t 4 ../../CONFIG/ORCA2_SAS_LIM3_ST/SHORT/SAS_00000240_restart_ice $NPROC >&- 
     39    ./rebuild_nemo -t 4 ../../CONFIG/ORCA2_SAS_SI3_ST/SHORT/SAS_00000240_restart_ice $NPROC >&- 
    4040    cd ${SAS_RESTART_DIR}/LONG 
    4141    #SF echo "COPY rebuild restart files" 
     
    387387  COMPIL_DIR=${TOOLS_DIR}/COMPILE 
    388388  NPROC=32 
    389   SAS_RESTART_DIR=${CONFIG_DIR0}/ORCA2_SAS_LIM3_ST 
     389  SAS_RESTART_DIR=${CONFIG_DIR0}/ORCA2_SAS_SI3_ST 
    390390# 
    391391# Show current revision tag and branch name 
     
    417417# Rebuild and restartability test for SAS 
    418418# clem: not needed anymore 
    419 # for restart_file in WORCA2_SAS_LIM3_ST 
     419# for restart_file in WORCA2_SAS_SI3_ST 
    420420# do 
    421421#   restfile $NEMO_VALID $restart_file $pass 
     
    425425 echo "" 
    426426 echo "   !----restart----!   " 
    427  for restart_test in WGYRE_PISCES_ST WORCA2_LIM3_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_LIM3_ST WAGRIF_NORDIC_ST WSPITZ12_ST WISOMIP_ST WOVERFLOW_ST WLOCK_EXCHANGE_ST WVORTEX_ST WWAD_ST WSAS_BIPER_ST  
     427 for restart_test in WGYRE_PISCES_ST WORCA2_SI3_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_SI3_ST WAGRIF_NORDIC_ST WSPITZ12_ST WISOMIP_ST WOVERFLOW_ST WLOCK_EXCHANGE_ST WVORTEX_ST WWAD_ST WSAS_BIPER_ST  
    428428 do 
    429429   resttest $NEMO_VALID $restart_test $pass 
     
    433433 echo "" 
    434434 echo "   !----repro----!   " 
    435  for repro_test in WGYRE_PISCES_ST WORCA2_LIM3_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_LIM3_ST WORCA2_LIM3_OBS_ST WAGRIF_NORDIC_ST WSPITZ12_ST WISOMIP_ST 
     435 for repro_test in WGYRE_PISCES_ST WORCA2_SI3_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_SI3_ST WORCA2_SI3_OBS_ST WAGRIF_NORDIC_ST WSPITZ12_ST WISOMIP_ST 
    436436 do 
    437437   reprotest $NEMO_VALID $repro_test $pass 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_test-cases.sh

    r9524 r9576  
    4545# 
    4646#  makenemo  : to create successive exectuables in ${CONFIG_NAME}/BLD/bin/nemo.exe  
    47 #              and links to opa in ${CONFIG_NAME}/EXP00) 
     47#              and links to nemo in ${CONFIG_NAME}/EXP00) 
    4848# 
    4949#  param.cfg : sets and loads following directories: 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_xios.sh

    r9019 r9576  
    3838# 
    3939#  makenemo  : to create successive exectuables in ${CONFIG_NAME}/BLD/bin/nemo.exe  
    40 #              and links to opa in ${CONFIG_NAME}/EXP00) 
     40#              and links to nemo in ${CONFIG_NAME}/EXP00) 
    4141# 
    4242#  param.cfg : sets and loads following directories: 
Note: See TracChangeset for help on using the changeset viewer.