Changeset 3390 for branches/2012/dev_r3387_LOCEAN6_AGRIF_LIM
- Timestamp:
- 2012-05-14T17:24:00+02:00 (12 years ago)
- Location:
- branches/2012/dev_r3387_LOCEAN6_AGRIF_LIM/NEMOGCM
- Files:
-
- 1 added
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2012/dev_r3387_LOCEAN6_AGRIF_LIM/NEMOGCM/CONFIG/makenemo
r3294 r3390 302 302 #if AGRIF we do a first preprocessing 303 303 if [ ${#x_c} -eq 0 ]; then 304 [ "$AGRIFUSE" == 1 ] && fcm build --ignore-lock -s 2 ${COMPIL_DIR}/$USEBLD 305 [ "$AGRIFUSE" == 1 ] && rm -rf ${NEMO_TDIR}/${NEW_CONF}/BLD/* 304 if [ "$AGRIFUSE" == 1 ]; then 305 fcm build --ignore-lock -j 1 ${COMPIL_DIR}/bld_preproagr.cfg ||{ cd - ; exit ;} 306 echo "" 307 echo "---------------------------------" 308 echo "CONV preprocessing successfull !!" 309 echo "---------------------------------" 310 echo "" 311 fi 306 312 fi 307 313 fcm build ${x_c} --ignore-lock -v ${x_v} -j ${NBR_PRC} ${COMPIL_DIR}/$USEBLD || cd - … … 311 317 #add remove for clean option 312 318 if [ ${#x_c} -ne 0 ]; then 319 rm -rf ${NEMO_TDIR}/${NEW_CONF}/OPAFILES 313 320 rm -rf ${NEMO_TDIR}/${NEW_CONF}/WORK 314 321 rm -rf ${NEMO_TDIR}/${NEW_CONF}/BLD -
branches/2012/dev_r3387_LOCEAN6_AGRIF_LIM/NEMOGCM/NEMO/NST_SRC/agrif2model.F90
r2528 r3390 5 5 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 6 6 !!---------------------------------------------------------------------- 7 SUBROUTINE Agrif2Model 8 !!--------------------------------------------- 9 !! *** ROUTINE Agrif2Model *** 10 !!--------------------------------------------- 11 END SUBROUTINE Agrif2model 7 12 8 13 SUBROUTINE Agrif_Set_numberofcells(Agrif_Gr) -
branches/2012/dev_r3387_LOCEAN6_AGRIF_LIM/NEMOGCM/NEMO/NST_SRC/agrif_user.F90
r3294 r3390 5 5 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 6 6 !!---------------------------------------------------------------------- 7 SUBROUTINE agrif_user 8 END SUBROUTINE 9 7 10 SUBROUTINE agrif_before_regridding 8 11 END SUBROUTINE -
branches/2012/dev_r3387_LOCEAN6_AGRIF_LIM/NEMOGCM/NEMO/OPA_SRC/lib_cray.f90
r2528 r3390 10 10 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 11 11 !!---------------------------------------------------------------------- 12 SUBROUTINE lib_cray 13 WRITE(*,*) 'lib_cray: You should not have seen this print! error?' 14 END SUBROUTINE lib_cray 15 12 16 SUBROUTINE wheneq ( i, x, j, t, ind, nn ) 13 17 IMPLICIT NONE -
branches/2012/dev_r3387_LOCEAN6_AGRIF_LIM/NEMOGCM/TOOLS/COMPILE/agrifpp.sh
r2520 r3390 26 26 # 27 27 # 28 # Look after key agrif, if yes the conv is used, otherwise standard pre-processing is performed. 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 32 # Note that agrif2model.F90 should not be preprocess (standard one) 29 33 # 30 34 # EXAMPLES … … 33 37 # :: 34 38 # 35 # $ ./agrifpp.sh 1 -Dkey39 # $ ./agrifpp.sh FILE_TO_PROCESS 36 40 # 37 # or38 #39 # $ ./agrifpp.sh -Dkey40 #41 41 # TODO 42 42 # ==== … … 55 55 # 56 56 #- 57 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 } }'` 62 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} 57 MYFILE=$(basename "$1") 58 if [ "$MYFILE" == "agrif2model.f90" ];then 59 \cp ${NEMO_TDIR}/${NEW_CONF}/WORK/${MYFILE/.f90/.F90} ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/obj/$MYFILE 85 60 else 86 shift 87 cpp $@ 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 88 62 fi 89 -
branches/2012/dev_r3387_LOCEAN6_AGRIF_LIM/NEMOGCM/TOOLS/COMPILE/bld.cfg
r3294 r3390 23 23 src::ioipsl $MAIN_DIR/EXTERNAL/IOIPSL/src 24 24 src::agrif $MAIN_DIR/EXTERNAL/AGRIF/AGRIF_FILES 25 src::nemo $CONFIG_DIR/$NEW_CONF/ WORK25 src::nemo $CONFIG_DIR/$NEW_CONF/OPAFILES/obj 26 26 27 27 #bld::lib::xmlf90 xmlf90 … … 54 54 bld::pp::nemo 1 55 55 bld::pp::agrif 1 56 bld::tool::fpp $COMPIL_DIR/agrifpp.sh 57 bld::tool::fppflags::nemo ${AGRIFUSE} %FPPFLAGS 58 bld::tool::fppflags::xmlio 0 %FPPFLAGS 59 bld::tool::fppflags::ioserver 0 %FPPFLAGS 60 bld::tool::fppflags::ioipsl 0 %FPPFLAGS 61 bld::tool::fppflags::agrif 0 %FPPFLAGS 56 bld::tool::fppflags::nemo %FPPFLAGS -I$CONFIG_DIR/$NEW_CONF/OPAFILES/inc 57 bld::tool::fppflags::xmlio %FPPFLAGS 58 bld::tool::fppflags::ioserver %FPPFLAGS 59 bld::tool::fppflags::ioipsl %FPPFLAGS 60 bld::tool::fppflags::agrif %FPPFLAGS 62 61 63 62 # Ignore the following dependencies … … 82 81 # Allow ".h90" as an extension for CPP include files 83 82 bld::infile_ext::h90 CPP::INCLUDE 83 bld::infile_ext::f90 FPP::FPP9X::SOURCE 84 84 85 85 # extension for module output … … 88 88 # rename executable to nemo.exe 89 89 bld::exe_name::model nemo.exe 90 -
branches/2012/dev_r3387_LOCEAN6_AGRIF_LIM/NEMOGCM/TOOLS/COMPILE/bldxag.cfg
r2734 r3390 44 44 bld::pp::ioipsl 1 45 45 bld::pp::nemo 1 46 bld::tool::fpp $COMPIL_DIR/agrifpp.sh 47 bld::tool::fppflags::nemo ${AGRIFUSE} %FPPFLAGS 48 bld::tool::fppflags::xmlio 0 %FPPFLAGS 49 bld::tool::fppflags::ioserver 0 %FPPFLAGS 50 bld::tool::fppflags::ioipsl 0 %FPPFLAGS 46 bld::tool::fppflags::nemo %FPPFLAGS 47 bld::tool::fppflags::xmlio %FPPFLAGS 48 bld::tool::fppflags::ioserver %FPPFLAGS 49 bld::tool::fppflags::ioipsl %FPPFLAGS 51 50 52 51 # Ignore the following dependencies -
branches/2012/dev_r3387_LOCEAN6_AGRIF_LIM/NEMOGCM/TOOLS/COMPILE/bldxio.cfg
r2437 r3390 15 15 src::ioipsl $MAIN_DIR/EXTERNAL/IOIPSL/src 16 16 src::agrif $MAIN_DIR/EXTERNAL/AGRIF/AGRIF_FILES 17 src::nemo $CONFIG_DIR/$NEW_CONF/WORK 18 17 src::nemo $CONFIG_DIR/$NEW_CONF/OPAFILES/obj 19 18 bld::target nemo.exe 20 19 bld::exe_dep 21 20 22 23 21 dir::root $NEMO_TDIR/$NEW_CONF/BLD 24 25 22 26 23 bld::tool::fc %FC … … 37 34 bld::pp::nemo 1 38 35 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 36 bld::tool::fppflags::nemo %FPPFLAGS -I$CONFIG_DIR/$NEW_CONF/OPAFILES/inc 37 bld::tool::fppflags::ioipsl %FPPFLAGS 38 bld::tool::fppflags::agrif %FPPFLAGS 43 39 44 40 # Ignore the following dependencies … … 63 59 # Allow ".h90" as an extension for CPP include files 64 60 bld::infile_ext::h90 CPP::INCLUDE 61 bld::infile_ext::f90 FPP::FPP9X::SOURCE 65 62 66 63 # extension for module output … … 69 66 # rename executable to nemo.exe 70 67 bld::exe_name::model nemo.exe 71 -
branches/2012/dev_r3387_LOCEAN6_AGRIF_LIM/NEMOGCM/TOOLS/COMPILE/bldxioxag.cfg
r2734 r3390 34 34 bld::pp::ioipsl 1 35 35 bld::pp::nemo 1 36 bld::tool::fpp $COMPIL_DIR/agrifpp.sh 37 bld::tool::fppflags::nemo ${AGRIFUSE} %FPPFLAGS 38 bld::tool::fppflags::ioipsl 0 %FPPFLAGS 36 bld::tool::fppflags::nemo %FPPFLAGS 37 bld::tool::fppflags::ioipsl %FPPFLAGS 39 38 40 39 # Ignore the following dependencies
Note: See TracChangeset
for help on using the changeset viewer.