Changeset 9573


Ignore:
Timestamp:
2018-05-11T14:25:02+02:00 (2 years ago)
Author:
nicolasmartin
Message:

Global renaming for compilation scripts (./TOOLS/COMPILE): tools scripts have been modified but not been tested

Location:
branches/2017/dev_merge_2017/NEMOGCM/TOOLS
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_merge_2017/NEMOGCM/TOOLS/COMPILE/Fcopy_dir.sh

    r4990 r9573  
    2727# 
    2828# When a reference configuration is set,  
    29 # Copy NEMO sub-directories needed (OPA_SRC, TOP_SRC ...) 
     29# Copy NEMO sub-directories needed (OCE_SRC, TOP_SRC ...) 
    3030# 
    3131# EXAMPLES 
  • branches/2017/dev_merge_2017/NEMOGCM/TOOLS/COMPILE/Fcopy_extdir.sh

    r4990 r9573  
    1818# =========== 
    1919# When an unsupported configuration is requested,  
    20 # Prepare sources for the NEMO sub-directories needed (OPA_SRC, TOP_SRC ...) 
     20# Prepare sources for the NEMO sub-directories needed (OCE_SRC, TOP_SRC ...) 
    2121# EXAMPLES 
    2222# ======== 
  • branches/2017/dev_merge_2017/NEMOGCM/TOOLS/COMPILE/Fmake_WORK.sh

    r8527 r9573  
    4545# :: 
    4646# 
    47 #  $ ./Fmake_WORK.sh ORCA2_LIM OPA_SRC LIM_SRC_2 
     47#  $ ./Fmake_WORK.sh ORCA2_LIM OCE_SRC ICE_SRC 
    4848# 
    4949# 
     
    8989while [ $i -lt $NDIR ] 
    9090do 
    91    [ "${ZTAB[i]}" = "OPA_SRC" ] && ln -sf ${NEMO_DIR}/OPA_SRC/*.[Ffh]90 ${ZCONF}/WORK 
    92    [ "${ZTAB[i]}" = "OPA_SRC" ] && ln -sf ${NEMO_DIR}/OPA_SRC/*/*.[Ffh]90 ${ZCONF}/WORK && break 
     91   [ "${ZTAB[i]}" = "OCE_SRC" ] && ln -sf ${NEMO_DIR}/OCE_SRC/*.[Ffh]90 ${ZCONF}/WORK 
     92   [ "${ZTAB[i]}" = "OCE_SRC" ] && ln -sf ${NEMO_DIR}/OCE_SRC/*/*.[Ffh]90 ${ZCONF}/WORK && break 
    9393   let i=$i+1 
    9494done 
     
    9797while [ $i -lt $NDIR ] 
    9898do 
    99    if [ "${ZTAB[i]}" != "OPA_SRC" ]; then 
     99   if [ "${ZTAB[i]}" != "OCE_SRC" ]; then 
    100100      ln -sf ${NEMO_DIR}/${ZTAB[i]}/*.[Ffh]90 ${ZCONF}/WORK 
    101101      ln -sf ${NEMO_DIR}/${ZTAB[i]}/*/*.[Ffh]90 ${ZCONF}/WORK  
  • branches/2017/dev_merge_2017/NEMOGCM/TOOLS/COMPILE/Fprep_agrif.sh

    r5656 r9573  
    7070 
    7171#- AGRIF sources 
    72 [ ! -d $2/$1/OPAFILES ] && mkdir  $2/$1/OPAFILES 
    73 [ ! -d $2/$1/OPAFILES/AGRIF_INC ] && mkdir  $2/$1/OPAFILES/AGRIF_INC 
    74 [ ! -d $2/$1/OPAFILES/AGRIF_MODELFILES ] && mkdir  $2/$1/OPAFILES/AGRIF_MODELFILES 
    75 cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/agrif_opa.in  $2/$1/OPAFILES/ 
    76 #cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/conv  $2/$1/OPAFILES/ 
    77 cp -f -r $2/$1/AGRIFLIB/bin/conv  $2/$1/OPAFILES/ 
     72[ ! -d $2/$1/NEMOFILES ] && mkdir  $2/$1/NEMOFILES 
     73[ ! -d $2/$1/NEMOFILES/AGRIF_INC ] && mkdir  $2/$1/NEMOFILES/AGRIF_INC 
     74[ ! -d $2/$1/NEMOFILES/AGRIF_MODELFILES ] && mkdir  $2/$1/NEMOFILES/AGRIF_MODELFILES 
     75cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/agrif_oce.in  $2/$1/NEMOFILES/ 
     76#cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/conv  $2/$1/NEMOFILES/ 
     77cp -f -r $2/$1/AGRIFLIB/bin/conv  $2/$1/NEMOFILES/ 
    7878 
    7979fi 
  • branches/2017/dev_merge_2017/NEMOGCM/TOOLS/COMPILE/agrifpp.sh

    r3680 r9573  
    2626# 
    2727# 
    28 # Preprocess file using the conv in OPAFILES directory 
    29 # Standard preprocessed files are stored in OPAFILES/ppsrc/nemo 
    30 # Source files are stored under OPAFILES/obj 
    31 # Include filess  in OPAFILES/inc 
     28# Preprocess file using the conv in NEMOFILES directory 
     29# Standard preprocessed files are stored in NEMOFILES/ppsrc/nemo 
     30# Source files are stored under NEMOFILES/obj 
     31# Include filess  in NEMOFILES/inc 
    3232# Note that agrif2model.F90 should not be preprocess (standard one)  
    3333# 
     
    5757MYFILE=$(basename "$1") 
    5858if [ "$MYFILE" == "agrif2model.f90" ];then 
    59    \cp ${NEMO_TDIR}/${NEW_CONF}/WORK/${MYFILE/.f90/.F90} ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/obj/$MYFILE 
     59   \cp ${NEMO_TDIR}/${NEW_CONF}/WORK/${MYFILE/.f90/.F90} ${NEMO_TDIR}/${NEW_CONF}/NEMOFILES/obj/$MYFILE 
    6060else 
    61 cd ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/ppsrc/nemo ; ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/conv ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/agrif_opa.in -rm -incdir ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/inc -comdirout ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/obj -convfile ${MYFILE} > /dev/null  
     61cd ${NEMO_TDIR}/${NEW_CONF}/NEMOFILES/ppsrc/nemo ; ${NEMO_TDIR}/${NEW_CONF}/NEMOFILES/conv ${NEMO_TDIR}/${NEW_CONF}/NEMOFILES/agrif_oce.in -rm -incdir ${NEMO_TDIR}/${NEW_CONF}/NEMOFILES/inc -comdirout ${NEMO_TDIR}/${NEW_CONF}/NEMOFILES/obj -convfile ${MYFILE} > /dev/null  
    6262fi 
  • branches/2017/dev_merge_2017/NEMOGCM/TOOLS/COMPILE/bld.cfg

    r5656 r9573  
    1515src::ioipsl               $MAIN_DIR/EXTERNAL/IOIPSL/src 
    1616src::agrif                $MAIN_DIR/EXTERNAL/AGRIF/AGRIF_FILES 
    17 src::nemo                 $CONFIG_DIR/$NEW_CONF/OPAFILES/obj 
     17src::nemo                 $CONFIG_DIR/$NEW_CONF/NEMOFILES/obj 
    1818 
    1919bld::target  nemo.exe 
     
    3939bld::pp::nemo     1 
    4040bld::pp::agrif    1 
    41 bld::tool::fppflags::nemo      %FPPFLAGS -I$CONFIG_DIR/$NEW_CONF/OPAFILES/inc 
     41bld::tool::fppflags::nemo      %FPPFLAGS -I$CONFIG_DIR/$NEW_CONF/NEMOFILES/inc 
    4242bld::tool::fppflags::ioipsl    %FPPFLAGS 
    4343bld::tool::fppflags::agrif     %FPPFLAGS -include ${MAIN_DIR}/EXTERNAL/AGRIF/nemo_mpi.h 
  • branches/2017/dev_merge_2017/NEMOGCM/TOOLS/COMPILE/bld_preproagr.cfg

    r5656 r9573  
    1616bld::target  lib_cray.f90 nemo.f90 agrif_user.f90 agrif2model.f90  
    1717 
    18 dir::root            $NEMO_TDIR/$NEW_CONF/OPAFILES 
     18dir::root            $NEMO_TDIR/$NEW_CONF/NEMOFILES 
    1919 
    2020bld::tool::fc_output 
  • branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/README_configs_namcfg_namdom

    r9019 r9573  
    22 
    33This README file contains the informations for the &namcfg namelist for some configurations whic are not one of the reference configurations. 
    4 These informations wher previoulsy in NEMO/OPA_SRC_par_*.h90 files. The full test with these configurations has not been done. 
     4These informations wher previoulsy in NEMO/OCE_SRC_par_*.h90 files. The full test with these configurations has not been done. 
    55 
    66 
  • branches/2017/dev_merge_2017/NEMOGCM/TOOLS/MISCELLANEOUS/chk_iomput.sh

    r8309 r9573  
    3737       echo '      ./chk_iomput.sh' 
    3838       echo '      ./chk_iomput.sh --help' 
    39        echo '      ./chk_iomput.sh ../../CONFIG/ORCA2_LIM/EXP00/context_nemo.xml "../../NEMO/OPA_SRC/ ../../NEMO/LIM_SRC_2/"' 
     39       echo '      ./chk_iomput.sh ../../CONFIG/ORCA2_LIM/EXP00/context_nemo.xml "../../NEMO/OCE_SRC/ ../../NEMO/ICE_SRC/"' 
    4040       echo 
    4141       exit ;; 
  • branches/2017/dev_merge_2017/NEMOGCM/TOOLS/MISCELLANEOUS/rewrite_nemo.sh

    r5407 r9573  
    136136# some specific changes... 
    137137# 
    138 # OPA_SRC/SBC/albedo.F90 
    139 sed -e "s/DIMENSION(jpi,jpj,ijpl/DIMENSION(jpi,jpj,SIZE(pt_ice,3)/" OPA_SRC/SBC/albedo.F90 > tmp$$ 
    140 mv tmp$$ OPA_SRC/SBC/albedo.F90 
     138# OCE_SRC/SBC/albedo.F90 
     139sed -e "s/DIMENSION(jpi,jpj,ijpl/DIMENSION(jpi,jpj,SIZE(pt_ice,3)/" OCE_SRC/SBC/albedo.F90 > tmp$$ 
     140mv tmp$$ OCE_SRC/SBC/albedo.F90 
    141141# see result of 
    142142#    grep -i "wrk_alloc" $( find . -name "*90" ) | grep "=" 
    143143# 
    144 # LIM_SRC_2/limrhg_2.F90 
    145 #./LIM_SRC_2/limrhg_2.F90:      CALL wrk_alloc( jpi,jpj+2, zu0, zv0, zu_n, zv_n, zu_a, zv_a, zviszeta, zviseta, kjstart = 0 ) 
    146 #./LIM_SRC_2/limrhg_2.F90:      CALL wrk_alloc( jpi,jpj+2, zzfrld, zztms, zi1, zi2, zmasst, zpresh, kjstart = 0 ) 
    147 sed -e "s/DIMENSION(jpi,jpj+2/DIMENSION(jpi,0:jpj+1/" LIM_SRC_2/limrhg_2.F90 > tmp$$ 
    148 mv tmp$$ LIM_SRC_2/limrhg_2.F90 
    149  
    150 # LIM_SRC_3/limitd_me.F90 
    151 #./LIM_SRC_3/limitd_me.F90:      CALL wrk_alloc( jpi,jpj,jpl+2, Gsum, kkstart = -1 ) 
    152 sed -e "s/DIMENSION(jpi,jpj,jpl+2)/DIMENSION(jpi,jpj,-1:jpl)/" LIM_SRC_3/limitd_me.F90 > tmp$$ 
    153 mv tmp$$ LIM_SRC_3/limitd_me.F90 
    154  
    155 # LIM_SRC_3/limitd_th.F90 
    156 #./LIM_SRC_3/limitd_th.F90:      CALL wrk_alloc( jpi,jpj,jpl+1, zhbnew, kkstart = 0 )    
    157 sed -e "s/DIMENSION(jpi,jpj,jpl+1)/DIMENSION(jpi,jpj,0:jpl)/" LIM_SRC_3/limitd_th.F90 > tmp$$ 
    158 mv tmp$$ LIM_SRC_3/limitd_th.F90 
    159  
    160 # LIM_SRC_3/limthd_dif.F90 
    161 #./LIM_SRC_3/limthd_dif.F90:      CALL wrk_alloc( jpij,nlay_i+1, ztcond_i, zradtr_i, zradab_i, zkappa_i, ztib, zeta_i, ztitemp, z_i, zspeche_i, kjstart=0 ) 
    162 #./LIM_SRC_3/limthd_dif.F90:      CALL wrk_alloc( jpij,nlay_s+1,           zradtr_s, zradab_s, zkappa_s, ztsb, zeta_s, ztstemp, z_s, kjstart=0 ) 
     144# ICE_SRC/limrhg_2.F90 
     145#./ICE_SRC/limrhg_2.F90:      CALL wrk_alloc( jpi,jpj+2, zu0, zv0, zu_n, zv_n, zu_a, zv_a, zviszeta, zviseta, kjstart = 0 ) 
     146#./ICE_SRC/limrhg_2.F90:      CALL wrk_alloc( jpi,jpj+2, zzfrld, zztms, zi1, zi2, zmasst, zpresh, kjstart = 0 ) 
     147sed -e "s/DIMENSION(jpi,jpj+2/DIMENSION(jpi,0:jpj+1/" ICE_SRC/limrhg_2.F90 > tmp$$ 
     148mv tmp$$ ICE_SRC/limrhg_2.F90 
     149 
     150# ICE_SRC/limitd_me.F90 
     151#./ICE_SRC/limitd_me.F90:      CALL wrk_alloc( jpi,jpj,jpl+2, Gsum, kkstart = -1 ) 
     152sed -e "s/DIMENSION(jpi,jpj,jpl+2)/DIMENSION(jpi,jpj,-1:jpl)/" ICE_SRC/limitd_me.F90 > tmp$$ 
     153mv tmp$$ ICE_SRC/limitd_me.F90 
     154 
     155# ICE_SRC/limitd_th.F90 
     156#./ICE_SRC/limitd_th.F90:      CALL wrk_alloc( jpi,jpj,jpl+1, zhbnew, kkstart = 0 )    
     157sed -e "s/DIMENSION(jpi,jpj,jpl+1)/DIMENSION(jpi,jpj,0:jpl)/" ICE_SRC/limitd_th.F90 > tmp$$ 
     158mv tmp$$ ICE_SRC/limitd_th.F90 
     159 
     160# ICE_SRC/limthd_dif.F90 
     161#./ICE_SRC/limthd_dif.F90:      CALL wrk_alloc( jpij,nlay_i+1, ztcond_i, zradtr_i, zradab_i, zkappa_i, ztib, zeta_i, ztitemp, z_i, zspeche_i, kjstart=0 ) 
     162#./ICE_SRC/limthd_dif.F90:      CALL wrk_alloc( jpij,nlay_s+1,           zradtr_s, zradab_s, zkappa_s, ztsb, zeta_s, ztstemp, z_s, kjstart=0 ) 
    163163sed -e "s/DIMENSION(kiut,nlay_i+1)/DIMENSION(kiut,0:nlay_i)/" \ 
    164     -e "s/DIMENSION(kiut,nlay_s+1)/DIMENSION(kiut,0:nlay_s)/" LIM_SRC_3/limthd_dif.F90 > tmp$$ 
    165 mv tmp$$ LIM_SRC_3/limthd_dif.F90 
    166  
    167 # LIM_SRC_3/limthd_ent.F90 
    168 #./LIM_SRC_3/limthd_ent.F90:      CALL wrk_alloc( jpij, nlay_i+3, zqh_cum0, zh_cum0, kjstart = 0 ) 
    169 #./LIM_SRC_3/limthd_ent.F90:      CALL wrk_alloc( jpij, nlay_i+1, zqh_cum1, zh_cum1, kjstart = 0 ) 
     164    -e "s/DIMENSION(kiut,nlay_s+1)/DIMENSION(kiut,0:nlay_s)/" ICE_SRC/limthd_dif.F90 > tmp$$ 
     165mv tmp$$ ICE_SRC/limthd_dif.F90 
     166 
     167# ICE_SRC/limthd_ent.F90 
     168#./ICE_SRC/limthd_ent.F90:      CALL wrk_alloc( jpij, nlay_i+3, zqh_cum0, zh_cum0, kjstart = 0 ) 
     169#./ICE_SRC/limthd_ent.F90:      CALL wrk_alloc( jpij, nlay_i+1, zqh_cum1, zh_cum1, kjstart = 0 ) 
    170170sed -e "s/DIMENSION(jpij,nlay_i+3)/DIMENSION(jpij,0:nlay_i+2)/" \ 
    171     -e "s/DIMENSION(jpij,nlay_i+1)/DIMENSION(jpij,0:nlay_i)/" LIM_SRC_3/limthd_ent.F90 > tmp$$ 
    172 mv tmp$$ LIM_SRC_3/limthd_ent.F90 
    173  
    174 # OPA_SRC/DYN/divcur.F90 
    175 #./OPA_SRC/DYN/divcur.F90:      CALL wrk_alloc( jpi+4, jpj  , zwv, kjstart = -1 ) 
    176 sed -e "s/DIMENSION(jpi+4,jpj)/DIMENSION(-1:jpi+2,jpj)/" OPA_SRC/DYN/divcur.F90 > tmp$$ 
    177 mv tmp$$ OPA_SRC/DYN/divcur.F90 
    178  
    179 # OPA_SRC/LDF/ldfslp.F90 
    180 #./OPA_SRC/LDF/ldfslp.F90:      CALL wrk_alloc( jpi,jpj,jpk,2, zdxrho , zdyrho, zdzrho,              klstart = 0  ) 
    181 #./OPA_SRC/LDF/ldfslp.F90:      CALL wrk_alloc( jpi,jpj,  2,2, zti_mlb, ztj_mlb,        kkstart = 0, klstart = 0  ) 
     171    -e "s/DIMENSION(jpij,nlay_i+1)/DIMENSION(jpij,0:nlay_i)/" ICE_SRC/limthd_ent.F90 > tmp$$ 
     172mv tmp$$ ICE_SRC/limthd_ent.F90 
     173 
     174# OCE_SRC/DYN/divcur.F90 
     175#./OCE_SRC/DYN/divcur.F90:      CALL wrk_alloc( jpi+4, jpj  , zwv, kjstart = -1 ) 
     176sed -e "s/DIMENSION(jpi+4,jpj)/DIMENSION(-1:jpi+2,jpj)/" OCE_SRC/DYN/divcur.F90 > tmp$$ 
     177mv tmp$$ OCE_SRC/DYN/divcur.F90 
     178 
     179# OCE_SRC/LDF/ldfslp.F90 
     180#./OCE_SRC/LDF/ldfslp.F90:      CALL wrk_alloc( jpi,jpj,jpk,2, zdxrho , zdyrho, zdzrho,              klstart = 0  ) 
     181#./OCE_SRC/LDF/ldfslp.F90:      CALL wrk_alloc( jpi,jpj,  2,2, zti_mlb, ztj_mlb,        kkstart = 0, klstart = 0  ) 
    182182sed -e "s/DIMENSION(jpi,jpj,jpk,2)/DIMENSION(jpi,jpj,jpk,0:1)/" \ 
    183     -e "s/DIMENSION(jpi,jpj,2,2)/DIMENSION(jpi,jpj,0:1,0:1)/" OPA_SRC/LDF/ldfslp.F90 > tmp$$ 
    184 mv tmp$$ OPA_SRC/LDF/ldfslp.F90 
    185 # OPA_SRC/ZDF/zdfkpp.F90 
    186 #./OPA_SRC/ZDF/zdfkpp.F90:      CALL wrk_alloc( jpi,3, zmoek, kjstart = 0 ) 
    187 sed -e "s/DIMENSION(jpi,3) *::* zmoek/DIMENSION(jpi,0:2) ::   zmoek/" OPA_SRC/ZDF/zdfkpp.F90 > tmp$$ 
    188 mv tmp$$ OPA_SRC/ZDF/zdfkpp.F90 
     183    -e "s/DIMENSION(jpi,jpj,2,2)/DIMENSION(jpi,jpj,0:1,0:1)/" OCE_SRC/LDF/ldfslp.F90 > tmp$$ 
     184mv tmp$$ OCE_SRC/LDF/ldfslp.F90 
     185# OCE_SRC/ZDF/zdfkpp.F90 
     186#./OCE_SRC/ZDF/zdfkpp.F90:      CALL wrk_alloc( jpi,3, zmoek, kjstart = 0 ) 
     187sed -e "s/DIMENSION(jpi,3) *::* zmoek/DIMENSION(jpi,0:2) ::   zmoek/" OCE_SRC/ZDF/zdfkpp.F90 > tmp$$ 
     188mv tmp$$ OCE_SRC/ZDF/zdfkpp.F90 
    189189 
    190190# links  
     
    192192# find . -type l 
    193193# 
    194 # ./LIM_SRC_2/limrhg.F90 
    195 cd LIM_SRC_2 
    196 ln -sf ../LIM_SRC_3/limrhg.F90 . 
     194# ./ICE_SRC/limrhg.F90 
     195cd ICE_SRC 
     196ln -sf ../ICE_SRC/limrhg.F90 . 
    197197cd .. 
    198198 
     
    204204# ./OOO_SRC/obs_fbm.F90 
    205205cd OOO_SRC 
    206 ln -sf ../OPA_SRC/OBS/obs_fbm.F90 . 
     206ln -sf ../OCE_SRC/OBS/obs_fbm.F90 . 
    207207cd .. 
  • branches/2017/dev_merge_2017/NEMOGCM/TOOLS/SIREN/src/docsrc/2_quickstart.md

    r7646 r9573  
    705705To do so, go to the directory *NEMOGCM/CONFIG/*, and run: 
    706706~~~~~~~~~~~~~~~~~~ 
    707 ./makenemo -n MY_CONFIG -d "OPA_SRC" 
     707./makenemo -n MY_CONFIG -d "OCE_SRC" 
    708708~~~~~~~~~~~~~~~~~~ 
    709709This creates your configuration "MY_CONFIG" in the directory *NEMOGCM/CONFIG*.<br/> 
Note: See TracChangeset for help on using the changeset viewer.