Changeset 2384
- Timestamp:
- 2010-11-15T04:20:07+01:00 (14 years ago)
- Location:
- branches/nemo_v3_3_beta/NEMOGCM
- Files:
-
- 7 added
- 6 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
branches/nemo_v3_3_beta/NEMOGCM/CONFIG/makenemo
r2359 r2384 271 271 272 272 #- and test whether we need to build the ioserver 273 if [ "$AGRIFUSE" == 1 ]; then 274 export USEBLD=bld_afterconvxio.cfg 275 grep key_iomput ${COMPIL_DIR}/cpp.fcm && export USEBLD=bld_afterconv.cfg 276 else 273 277 export USEBLD=bldxio.cfg 274 278 grep key_iomput ${COMPIL_DIR}/cpp.fcm && export USEBLD=bld.cfg 279 fi 275 280 276 281 #- … … 283 288 if [ "${NBR_PRC}" -gt 0 ]; then 284 289 cd ${NEMO_TDIR}/${NEW_CONF} || cd - 285 286 #if AGRIF we do a first preprocessing287 290 if [ ${#x_c} -eq 0 ]; then 288 [ "$AGRIFUSE" == 1 ] && fcm build --ignore-lock -s 2 ${COMPIL_DIR}/$USEBLD 289 [ "$AGRIFUSE" == 1 ] && rm -rf ${NEMO_TDIR}/${NEW_CONF}/BLD/* 290 fi 291 fcm build ${x_c} --ignore-lock -v 1 -j ${NBR_PRC} ${COMPIL_DIR}/$USEBLD || cd - 292 [ -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 293 [ -f ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/server.exe ] && ln -sf ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/server.exe ${CONFIG_DIR}/${NEW_CONF}/EXP00/server.exe 294 295 #add remove for clean option 296 if [ ${#x_c} -ne 0 ]; then 291 if [ "$AGRIFUSE" == 1 ]; then 292 fcm build --ignore-lock -s 2 ${COMPIL_DIR}/bld_agrif1.cfg 293 fcm build --ignore-lock -s 2 ${COMPIL_DIR}/bld_agrif2.cfg 294 touch ${NEMO_TDIR}/${NEW_CONF}/BLD/OPAFILES/BLD1/ppsrc/nemo/* 295 fcm build --ignore-lock -s 2 ${COMPIL_DIR}/bld_agrif2.cfg 296 fcm build --ignore-lock -s 2 ${COMPIL_DIR}/bld_agrif3.cfg 297 fi 298 fcm build ${x_c} --ignore-lock -v 1 -j ${NBR_PRC} ${COMPIL_DIR}/$USEBLD || cd - 299 [ -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 300 [ -f ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/server.exe ] && ln -sf ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/server.exe ${CONFIG_DIR}/${NEW_CONF}/EXP00/server.exe 301 else 297 302 rm -rf ${NEMO_TDIR}/${NEW_CONF}/WORK 298 303 rm -rf ${NEMO_TDIR}/${NEW_CONF}/BLD … … 301 306 echo "cleaning ${NEW_CONF} WORK, BLD" 302 307 fi 303 304 308 fi 305 309 -
branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90
r2370 r2384 23 23 USE iom ! I/O module 24 24 USE restart ! restart 25 USE closea 25 26 26 27 IMPLICIT NONE … … 425 426 !! rnfmsk_z vertical structure 426 427 !!---------------------------------------------------------------------- 427 USE closea, ONLY : clo_rnf ! rnfmsk update routine428 428 ! 429 429 INTEGER :: inum ! temporary integers -
branches/nemo_v3_3_beta/NEMOGCM/TOOLS/COMPILE/Fclean_var.sh
r2143 r2384 66 66 unset -v COMPIL_DIR 67 67 unset -v NEMO_DIR 68 unset -v USEBLD -
branches/nemo_v3_3_beta/NEMOGCM/TOOLS/COMPILE/Fprep_agrif.sh
r2143 r2384 63 63 64 64 #- AGRIF sources 65 [ ! -d $2/$1/OPAFILES ] && mkdir $2/$1/OPAFILES 66 [ ! -d $2/$1/OPAFILES/AGRIF_INC ] && mkdir $2/$1/OPAFILES/AGRIF_INC 67 [ ! -d $2/$1/OPAFILES/AGRIF_MODELFILES ] && mkdir $2/$1/OPAFILES/AGRIF_MODELFILES 68 cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/agrif_opa.in $2/$1/OPAFILES/ 69 cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/conv $2/$1/OPAFILES/ 65 [ ! -d $2/$1/BLD/OPAFILES ] && mkdir $2/$1/BLD/OPAFILES 66 [ ! -d $2/$1/BLD/OPAFILES/AGRIF_MODELFILES ] && mkdir $2/$1/BLD/OPAFILES/AGRIF_MODELFILES 67 cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/agrif_opa.in $2/$1/BLD/OPAFILES/ 68 cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/conv $2/$1/BLD/OPAFILES/ 70 69 71 70 fi -
branches/nemo_v3_3_beta/NEMOGCM/TOOLS/COMPILE/agrifpp2.sh
r2367 r2384 7 7 # 8 8 9 # ========== 10 # agrifpp .sh11 # ========== 9 # =========== 10 # agrifpp2.sh 11 # =========== 12 12 # 13 13 # ---------------------------- … … 20 20 # :: 21 21 # 22 # $ agrifpp .sh22 # $ agrifpp2.sh 23 23 # 24 24 # … … 34 34 # :: 35 35 # 36 # $ ./agrifpp .sh 1 -Dkey36 # $ ./agrifpp2.sh 1 -Dkey 37 37 # 38 38 # or 39 39 # 40 # $ ./agrifpp .sh -Dkey40 # $ ./agrifpp2.sh -Dkey 41 41 # 42 42 # TODO … … 62 62 FPP_OPT=` echo $* |awk '{ for (i=1 ; i<NF ; i++ ) { printf " %s", $i } }'` 63 63 64 [ ! -d ${NEMO_TDIR}/${NEW_CONF}/BLD/OPAFILES/BLD1/ppsrc/nemo/AGRIF_INC ] && mkdir ${NEMO_TDIR}/${NEW_CONF}/BLD/OPAFILES/BLD1/ppsrc/nemo/AGRIF_INC 64 65 65 if [ "${MYFILE}" != "par_oce.F90" -a ! -f ${NEMO_TDIR}/${NEW_CONF}}/OPAFILES/param_done ]; then 66 cpp ${FPP_OPT} ${CONFIG_DIR}/${NEW_CONF}/WORK/par_oce.F90 > ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/par_oce.F90 67 (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 ) 68 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 69 touch ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/param_done 70 elif [ "${MYFILE}" == "par_oce.F90" -a -f ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/param_done ] ; then 71 cd ${NEMO_TDIR}/${NEW_CONF}/OPAFILES 72 cpp ${FPP_OPT} -I${NEMO_TDIR}/${NEW_CONF}/OPAFILES/AGRIF_INC ${MYFILE} 73 exit 74 fi 75 76 if [ "${MYFILE}" == agrif2model.F90 ]; then 77 cpp -I${NEMO_TDIR}/${NEW_CONF}/OPAFILES/AGRIF_INC $@ 78 exit 79 fi 80 81 cpp -I${NEMO_TDIR}/${NEW_CONF}/OPAFILES/AGRIF_INC $@ > ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/${MYFILE} 82 ( cd ${NEMO_TDIR}/${NEW_CONF}/OPAFILES ; ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/conv agrif_opa.in -rm -comdirin ./ -comdirout AGRIF_MODELFILES/ -convfile ${MYFILE} > /dev/null ) 83 cd ${NEMO_TDIR}/${NEW_CONF} 84 mv -f OPAFILES/AGRIF_MODELFILES/${MYFILE} OPAFILES/${MYFILE} 85 cpp ${FPP_OPT} -IOPAFILES/AGRIF_INC OPAFILES/${MYFILE} 66 ${NEMO_TDIR}/${NEW_CONF}/BLD/OPAFILES/conv ${NEMO_TDIR}/${NEW_CONF}/BLD/OPAFILES/agrif_opa.in -rm -comdirin ${NEMO_TDIR}/${NEW_CONF}/BLD/OPAFILES/BLD1/ppsrc/nemo/ -comdirout ${NEMO_TDIR}/${NEW_CONF}/BLD/OPAFILES/AGRIF_MODELFILES/ -convfile ${MYFILE} > /dev/null 67 cpp ${FPP_OPT} -I${NEMO_TDIR}/${NEW_CONF}/BLD/OPAFILES/BLD1/ppsrc/nemo/AGRIF_INC ${NEMO_TDIR}/${NEW_CONF}/BLD/OPAFILES/AGRIF_MODELFILES/${MYFILE} 86 68 else 87 69 shift 88 70 cpp $@ 89 71 fi 90 -
branches/nemo_v3_3_beta/NEMOGCM/TOOLS/COMPILE/bld.cfg
r2281 r2384 54 54 bld::pp::nemo 1 55 55 bld::pp::agrif 1 56 bld::tool::fpp $COMPIL_DIR/agrifpp.sh57 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%FPPFLAGS56 bld::tool::fpp cpp 57 bld::tool::fppflags::nemo %FPPFLAGS 58 bld::tool::fppflags::xmlio %FPPFLAGS 59 bld::tool::fppflags::ioserver %FPPFLAGS 60 bld::tool::fppflags::ioipsl %FPPFLAGS 61 bld::tool::fppflags::agrif %FPPFLAGS 62 62 63 63 # Ignore the following dependencies -
branches/nemo_v3_3_beta/NEMOGCM/TOOLS/COMPILE/bldxio.cfg
r2301 r2384 37 37 bld::pp::nemo 1 38 38 bld::pp::agrif 1 39 bld::tool::fpp $COMPIL_DIR/agrifpp.sh40 bld::tool::fppflags::nemo ${AGRIFUSE}%FPPFLAGS41 bld::tool::fppflags::ioipsl 0%FPPFLAGS42 bld::tool::fppflags::agrif 0%FPPFLAGS39 bld::tool::fpp cpp 40 bld::tool::fppflags::nemo %FPPFLAGS 41 bld::tool::fppflags::ioipsl %FPPFLAGS 42 bld::tool::fppflags::agrif %FPPFLAGS 43 43 44 44 # Ignore the following dependencies
Note: See TracChangeset
for help on using the changeset viewer.