Changeset 2815
- Timestamp:
- 2011-07-28T19:00:06+02:00 (13 years ago)
- Location:
- branches/2011/dev_r2802_LOCEAN10_agrif_lim/NEMOGCM
- Files:
-
- 1 added
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2011/dev_r2802_LOCEAN10_agrif_lim/NEMOGCM/CONFIG/makenemo
r2731 r2815 90 90 export COMPIL_DIR=${MAIN_DIR}/TOOLS/COMPILE 91 91 export NEMO_DIR=${MAIN_DIR}/NEMO 92 export AGRIFUSE= 1092 export AGRIFUSE="" 93 93 94 94 declare -a TAB … … 269 269 270 270 #- We look after agrif 271 grep key_agrif ${COMPIL_DIR}/cpp.fcm && export AGRIFUSE= 1&& export USEBLD=${USEBLD/xag/}271 grep key_agrif ${COMPIL_DIR}/cpp.fcm && export AGRIFUSE="WITH_AGRIF" && export USEBLD=${USEBLD/xag/} 272 272 . ${COMPIL_DIR}/Fprep_agrif.sh ${NEW_CONF} ${NEMO_TDIR} || exit 273 273 … … 284 284 if [ "${NBR_PRC}" -gt 0 ]; then 285 285 cd ${NEMO_TDIR}/${NEW_CONF} || cd - 286 287 #if AGRIF we do a first preprocessing288 if [ ${#x_c} -eq 0 ]; then289 [ "$AGRIFUSE" == 1 ] && fcm build --ignore-lock -s 2 ${COMPIL_DIR}/$USEBLD290 [ "$AGRIFUSE" == 1 ] && rm -rf ${NEMO_TDIR}/${NEW_CONF}/BLD/*291 fi292 286 fcm build ${x_c} --ignore-lock -v 1 -j ${NBR_PRC} ${COMPIL_DIR}/$USEBLD || cd - 293 287 [ -f ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/nemo.exe ] && ln -sf ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/nemo.exe ${CONFIG_DIR}/${NEW_CONF}/EXP00/opa -
branches/2011/dev_r2802_LOCEAN10_agrif_lim/NEMOGCM/NEMO/NST_SRC/agrif2model.F90
r2528 r2815 1 1 #if defined key_agrif 2 2 3 !!---------------------------------------------------------------------- 3 4 !! NEMO/NST 3.3 , NEMO Consortium (2010) … … 5 6 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 6 7 !!---------------------------------------------------------------------- 7 8 !$AGRIF_DO_NOT_TREAT 8 9 SUBROUTINE Agrif_Set_numberofcells(Agrif_Gr) 9 10 !!--------------------------------------------- … … 11 12 !!--------------------------------------------- 12 13 USE Agrif_Types 14 USE nemogcm 13 15 IMPLICIT NONE 14 16 … … 92 94 93 95 END SUBROUTINE Agrif_comm_def 96 !$AGRIF_END_DO_NOT_TREAT 94 97 #else 95 98 SUBROUTINE Agrif2Model -
branches/2011/dev_r2802_LOCEAN10_agrif_lim/NEMOGCM/NEMO/OPA_SRC/BDY/bdy_oce.F90
r2715 r2815 8 8 !! 3.3 ! 2010-09 (D. Storkey) add ice boundary conditions 9 9 !!---------------------------------------------------------------------- 10 USE par_oce ! ocean parameters 11 USE lib_mpp ! distributed memory computing 10 12 #if defined key_bdy 11 13 !!---------------------------------------------------------------------- 12 14 !! 'key_bdy' Unstructured Open Boundary Condition 13 15 !!---------------------------------------------------------------------- 14 USE par_oce ! ocean parameters15 16 USE bdy_par ! Unstructured boundary parameters 16 USE lib_mpp ! distributed memory computing17 17 18 18 IMPLICIT NONE -
branches/2011/dev_r2802_LOCEAN10_agrif_lim/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90
r2528 r2815 9 9 !! 3.3 ! 2010-09 (D.Storkey and E.O'Dea) bug fixes 10 10 !!---------------------------------------------------------------------- 11 USE oce ! ocean dynamics and tracers 12 USE dom_oce ! ocean space and time domain 13 USE iom 14 USE in_out_manager ! I/O units 15 USE phycst ! physical constants 16 USE lbclnk ! ocean lateral boundary conditions (or mpp link) 17 USE bdy_par ! Unstructured boundary parameters 18 USE bdy_oce ! ocean open boundary conditions 19 USE daymod ! calendar 11 20 #if defined key_bdy 12 21 !!---------------------------------------------------------------------- … … 24 33 !! vset :/ 25 34 !!---------------------------------------------------------------------- 26 USE oce ! ocean dynamics and tracers27 USE dom_oce ! ocean space and time domain28 USE iom29 USE in_out_manager ! I/O units30 USE phycst ! physical constants31 USE lbclnk ! ocean lateral boundary conditions (or mpp link)32 USE bdy_par ! Unstructured boundary parameters33 USE bdy_oce ! ocean open boundary conditions34 USE daymod ! calendar35 35 36 36 IMPLICIT NONE -
branches/2011/dev_r2802_LOCEAN10_agrif_lim/NEMOGCM/NEMO/OPA_SRC/OBS/obs_sla_types.F90
r2287 r2815 12 12 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 13 13 !!---------------------------------------------------------------------- 14 USE par_oce 14 15 15 16 IMPLICIT NONE -
branches/2011/dev_r2802_LOCEAN10_agrif_lim/NEMOGCM/NEMO/OPA_SRC/OBS/obs_types.F90
r2358 r2815 27 27 !! ! 06-10 (A. Weaver) Cleanup 28 28 !!--------------------------------------------------------------------- 29 30 USE par_oce 29 31 30 32 IMPLICIT NONE -
branches/2011/dev_r2802_LOCEAN10_agrif_lim/NEMOGCM/NEMO/OPA_SRC/par_oce.F90
r2715 r2815 9 9 !!---------------------------------------------------------------------- 10 10 USE par_kind ! kind parameters 11 #if defined key_agrif 12 USE agrif_util 13 USE agrif_types 14 #endif 11 15 12 16 IMPLICIT NONE -
branches/2011/dev_r2802_LOCEAN10_agrif_lim/NEMOGCM/TOOLS/COMPILE/Fprep_agrif.sh
r2520 r2815 56 56 57 57 #- AGRIF conv 58 if [ "$AGRIFUSE" == 1]; then58 if [ "$AGRIFUSE" == "WITH_AGRIF" ]; then 59 59 60 60 #- CONV -
branches/2011/dev_r2802_LOCEAN10_agrif_lim/NEMOGCM/TOOLS/COMPILE/agrifpp.sh
r2520 r2815 10 10 # ========== 11 11 # 12 # --------------------------- -13 # Preform AGrifpre-processing14 # --------------------------- -12 # --------------------------- 13 # Preform CPP pre-processing 14 # --------------------------- 15 15 # 16 16 # SYNOPSIS … … 26 26 # 27 27 # 28 # Look after key agrif, if yes the conv is used, otherwise standard pre-processing is performed. 28 # Look after key agrif, if yes agrif2model is not yet pre-pocessed, otehrwise we use 29 # standard cpp. 29 30 # 30 31 # EXAMPLES … … 33 34 # :: 34 35 # 35 # $ ./agrifpp.sh 1 -Dkey36 # $ ./agrifpp.sh -Dkey 36 37 # 37 # or38 #39 # $ ./agrifpp.sh -Dkey40 38 # 41 39 # TODO … … 56 54 #- 57 55 58 if [ "$1" == "1" ]; then 59 shift 60 MYFILE=`echo $* |awk -F" " '{print $NF}' ` 61 FPP_OPT=` echo $* |awk '{ for (i=1 ; i<NF ; i++ ) { printf " %s", $i } }'` 56 MYFILE=`echo $* |awk -F" " '{print $NF}' ` 57 FPP_OPT=` echo $* |awk '{ for (i=1 ; i<NF ; i++ ) { printf " %s", $i } }'` 58 AGRIF_ACTIVATED=$( echo $FPP_OPT | grep key_agrif ) 62 59 63 64 if [ "${MYFILE}" != "par_oce.F90" -a ! -f ${NEMO_TDIR}/${NEW_CONF}}/OPAFILES/param_done ]; then 65 cpp ${FPP_OPT} ${CONFIG_DIR}/${NEW_CONF}/WORK/par_oce.F90 > ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/par_oce.F90 66 (cd ${NEMO_TDIR}/${NEW_CONF}/OPAFILES ; ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/conv agrif_opa.in -rm -comdirin ./ -comdirout AGRIF_MODELFILES/ -convfile par_oce.F90 > /dev/null ) 67 cpp ${FPP_OPT} -I${NEMO_TDIR}/${NEW_CONF}/OPAFILES/AGRIF_INC ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/AGRIF_MODELFILES/par_oce.F90 > ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/par_oce.F90 68 touch ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/param_done 69 elif [ "${MYFILE}" == "par_oce.F90" -a -f ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/param_done ] ; then 70 cd ${NEMO_TDIR}/${NEW_CONF}/OPAFILES 71 cpp ${FPP_OPT} -I${NEMO_TDIR}/${NEW_CONF}/OPAFILES/AGRIF_INC ${MYFILE} 72 exit 73 fi 74 75 if [ "${MYFILE}" == agrif2model.F90 ]; then 76 cpp -I${NEMO_TDIR}/${NEW_CONF}/OPAFILES/AGRIF_INC $@ 77 exit 78 fi 79 80 cpp -I${NEMO_TDIR}/${NEW_CONF}/OPAFILES/AGRIF_INC $@ > ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/${MYFILE} 81 ( cd ${NEMO_TDIR}/${NEW_CONF}/OPAFILES ; ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/conv agrif_opa.in -rm -comdirin ./ -comdirout AGRIF_MODELFILES/ -convfile ${MYFILE} > /dev/null ) 82 cd ${NEMO_TDIR}/${NEW_CONF} 83 sed 's/[ ]*$//' OPAFILES/AGRIF_MODELFILES/${MYFILE}> OPAFILES/${MYFILE} 84 cpp ${FPP_OPT} -IOPAFILES/AGRIF_INC OPAFILES/${MYFILE} 60 if [ "$MYFILE" == "agrif2model.F90" -a "${#AGRIF_ACTIVATED}" -gt 0 ]; then 61 cat $MYFILE 85 62 else 86 shift87 63 cpp $@ 88 64 fi -
branches/2011/dev_r2802_LOCEAN10_agrif_lim/NEMOGCM/TOOLS/COMPILE/bld.cfg
r2437 r2815 25 25 src::nemo $CONFIG_DIR/$NEW_CONF/WORK 26 26 27 #bld::lib::xmlf90 xmlf9028 #bld::lib::xmlio xmlio29 #bld::lib::ioserver ioserver30 #bld::lib::ioipsl ioipsl31 #bld::lib::agrif agrif32 #bld::lib::nemo nemo33 #bld::target libxmlf90.a libioserver.a libxmlio.a libioipsl.a libagrif.a libnemo.a server.exe nemo.exe34 27 bld::target server.exe nemo.exe 35 28 bld::exe_dep … … 39 32 40 33 41 bld::tool::fc %FC34 bld::tool::fc $TOOLS_DIR/COMPILE/agriffc.sh %FC 42 35 bld::tool::fflags %FCFLAGS %USER_INC 43 bld::tool::fflags::agrif %FFLAGS %USER_INC 36 bld::tool::fflags::nemo $AGRIFUSE %FCFLAGS %USER_INC 37 bld::tool::fflags::agrif %FFLAGS %USER_INC 44 38 bld::tool::ld %LD 45 39 bld::tool::ldflags %LDFLAGS %USER_LIB … … 55 49 bld::pp::agrif 1 56 50 bld::tool::fpp $COMPIL_DIR/agrifpp.sh 57 bld::tool::fppflags::nemo ${AGRIFUSE}%FPPFLAGS58 bld::tool::fppflags::xmlio 0%FPPFLAGS59 bld::tool::fppflags::ioserver 0%FPPFLAGS60 bld::tool::fppflags::ioipsl 0%FPPFLAGS61 bld::tool::fppflags::agrif 0%FPPFLAGS51 bld::tool::fppflags::nemo %FPPFLAGS 52 bld::tool::fppflags::xmlio %FPPFLAGS 53 bld::tool::fppflags::ioserver %FPPFLAGS 54 bld::tool::fppflags::ioipsl %FPPFLAGS 55 bld::tool::fppflags::agrif %FPPFLAGS 62 56 63 57 # Ignore the following dependencies … … 77 71 bld::excl_dep use::mod_comprism_proto 78 72 bld::excl_dep use::mkl_dfti 73 bld::excl_dep h::setnumberofcells.h 74 bld::excl_dep h::getnumberofcells.h 75 bld::excl_dep h::include_use_alloc_agrif.h 76 bld::excl_dep h::allocations_calls_agrif.h 77 bld::excl_dep h::modtype_agrif.h 78 bld::excl_dep h::probdim_agrif.h 79 bld::excl_dep h::keys_agrif.h 80 79 81 # Don't generate interface files 80 82 bld::tool::geninterface none -
branches/2011/dev_r2802_LOCEAN10_agrif_lim/NEMOGCM/TOOLS/COMPILE/bldxag.cfg
r2734 r2815 31 31 32 32 33 bld::tool::fc %FC 33 bld::tool::fc $TOOLS_DIR/COMPILE/agriffc.sh %FC 34 bld::tool::fflags::nemo $AGRIFUSE %FCFLAGS %USER_INC 34 35 bld::tool::fflags %FCFLAGS %USER_INC 35 36 bld::tool::ld %LD … … 45 46 bld::pp::nemo 1 46 47 bld::tool::fpp $COMPIL_DIR/agrifpp.sh 47 bld::tool::fppflags::nemo ${AGRIFUSE}%FPPFLAGS48 bld::tool::fppflags::xmlio 0%FPPFLAGS49 bld::tool::fppflags::ioserver 0%FPPFLAGS50 bld::tool::fppflags::ioipsl 0%FPPFLAGS48 bld::tool::fppflags::nemo %FPPFLAGS 49 bld::tool::fppflags::xmlio %FPPFLAGS 50 bld::tool::fppflags::ioserver %FPPFLAGS 51 bld::tool::fppflags::ioipsl %FPPFLAGS 51 52 52 53 # Ignore the following dependencies … … 66 67 bld::excl_dep use::mod_comprism_proto 67 68 bld::excl_dep use::mkl_dfti 69 bld::excl_dep h::setnumberofcells.h 70 bld::excl_dep h::getnumberofcells.h 71 bld::excl_dep h::include_use_alloc_agrif.h 72 bld::excl_dep h::allocations_calls_agrif.h 73 bld::excl_dep h::modtype_agrif.h 74 bld::excl_dep h::probdim_agrif.h 75 bld::excl_dep h::keys_agrif.h 76 68 77 # Don't generate interface files 69 78 bld::tool::geninterface none -
branches/2011/dev_r2802_LOCEAN10_agrif_lim/NEMOGCM/TOOLS/COMPILE/bldxio.cfg
r2437 r2815 11 11 inc $COMPIL_DIR/cpp.fcm 12 12 13 search_src 113 #search_src 1 14 14 15 15 src::ioipsl $MAIN_DIR/EXTERNAL/IOIPSL/src … … 24 24 25 25 26 bld::tool::fc %FC 27 bld::tool::fflags %FCFLAGS %USER_INC 28 bld::tool::fflags::agrif %FFLAGS %USER_INC 26 bld::tool::fc $TOOLS_DIR/COMPILE/agriffc.sh %FC 27 bld::tool::fflags %FCFLAGS %USER_INC 28 bld::tool::fflags::nemo $AGRIFUSE %FCFLAGS %USER_INC 29 bld::tool::fflags::agrif %FFLAGS %USER_INC 29 30 bld::tool::ld %LD 30 31 bld::tool::ldflags %LDFLAGS %USER_LIB … … 37 38 bld::pp::nemo 1 38 39 bld::pp::agrif 1 39 bld::tool::fpp $COMPIL_DIR/agrifpp.sh 40 bld::tool::fppflags::nemo ${AGRIFUSE} %FPPFLAGS 41 bld::tool::fppflags::ioipsl 0 %FPPFLAGS 42 bld::tool::fppflags::agrif 0 %FPPFLAGS 40 bld::tool::fpp $TOOLS_DIR/COMPILE/agrifpp.sh 41 bld::tool::fppflags::nemo %FPPFLAGS 42 bld::tool::fppflags::ioipsl %FPPFLAGS 43 bld::tool::fppflags::agrif %FPPFLAGS 44 43 45 44 46 # Ignore the following dependencies … … 58 60 bld::excl_dep use::mod_comprism_proto 59 61 bld::excl_dep use::mkl_dfti 62 bld::excl_dep h::setnumberofcells.h 63 bld::excl_dep h::getnumberofcells.h 64 bld::excl_dep h::include_use_alloc_agrif.h 65 bld::excl_dep h::allocations_calls_agrif.h 66 bld::excl_dep h::modtype_agrif.h 67 bld::excl_dep h::probdim_agrif.h 68 bld::excl_dep h::keys_agrif.h 69 70 60 71 # Don't generate interface files 61 72 bld::tool::geninterface none -
branches/2011/dev_r2802_LOCEAN10_agrif_lim/NEMOGCM/TOOLS/COMPILE/bldxioxag.cfg
r2734 r2815 23 23 24 24 25 bld::tool::fc %FC 26 bld::tool::fflags %FCFLAGS %USER_INC 25 bld::tool::fc $TOOLS_DIR/COMPILE/agriffc.sh %FC 26 bld::tool::fflags %FCFLAGS %USER_INC 27 bld::tool::fflags::nemo $AGRIFUSE %FCFLAGS %USER_INC 27 28 bld::tool::ld %LD 28 29 bld::tool::ldflags %LDFLAGS %USER_LIB … … 35 36 bld::pp::nemo 1 36 37 bld::tool::fpp $COMPIL_DIR/agrifpp.sh 37 bld::tool::fppflags::nemo ${AGRIFUSE}%FPPFLAGS38 bld::tool::fppflags::ioipsl 0%FPPFLAGS38 bld::tool::fppflags::nemo %FPPFLAGS 39 bld::tool::fppflags::ioipsl %FPPFLAGS 39 40 40 41 # Ignore the following dependencies … … 54 55 bld::excl_dep use::mod_comprism_proto 55 56 bld::excl_dep use::mkl_dfti 57 bld::excl_dep h::setnumberofcells.h 58 bld::excl_dep h::getnumberofcells.h 59 bld::excl_dep h::include_use_alloc_agrif.h 60 bld::excl_dep h::allocations_calls_agrif.h 61 bld::excl_dep h::modtype_agrif.h 62 bld::excl_dep h::probdim_agrif.h 63 bld::excl_dep h::keys_agrif.h 64 56 65 # Don't generate interface files 57 66 bld::tool::geninterface none
Note: See TracChangeset
for help on using the changeset viewer.