Ignore:
Timestamp:
Mar 29, 2023, 3:14:27 PM (21 months ago)
Author:
lguez
Message:

Sync latest trunk changes to branch LMDZ_ECRad

Location:
LMDZ6/branches/LMDZ_ECRad
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/LMDZ_ECRad

  • LMDZ6/branches/LMDZ_ECRad/makelmdz

    r4203 r4482  
    111111[-prod / -dev / -debug]    : compilation mode production (default) / developement / debug
    112112[-c false/MPI1/MPI2]       : coupling with ocean model : MPI1/MPI2/false (default: false)
    113 [-v false/orchidee2.0/orchidee1.9/true] : version of the vegetation model to include (default: false)
     113[-v false/orchideetrunk/orchidee2.1/orchidee2.0/orchidee1.9] : version of the vegetation model to include (default: false)
    114114          false       : no vegetation model
    115           orchidee2.1 : compile using ORCHIDEE 2.1 (or more recent version)
     115          orchideetrunk : compile using ORCHIDEE trunk from revision 7757 or higher
     116          orchidee2.1 : compile using ORCHIDEE 2.1 until 4.1 included or until revision 7757 on the trunk
    116117          orchidee2.0 : compile using ORCHIDEE 2.0 (or more recent version)
    117118          orchidee1.9 : compile using ORCHIDEE up to the version including OpenMP in ORCHIDEE : tag 1.9-1.9.5(version AR5)-1.9.6
    … …  
    123124[-inlandsis true/false]  : compile with/without inlandsis package (default: false)
    124125[-rrtm true/false]    : compile with/without rrtm package (default: false)
    125 [-rad old/rrtm/ecrad]    : compile with old/rrtm/ecrad radiatif code (default: old)
     126[-rad oldrad/rrtm/ecrad]    : compile with oldrad/rrtm/ecrad radiatif code (default: oldrad)
    126127[-dust true/false]    : compile with/without the dust package from Boucher et al. (default: false)
    127128[-strataer true/false]    : compile with/without the strat aer package from Boucher et al. (default: false)
    … …  
    195196
    196197      "-rrtm")
    197           rrtm="$2" ; if [ "$2" = "false" ] ; then rad="old" ; else rad="rrtm" ; fi ; shift ; shift ;;
     198          rrtm="$2" ; if [ "$2" = "false" ] ; then rad="oldrad" ; else rad="rrtm" ; fi ; shift ; shift ;;
    198199
    199200      "-rad")
    … …  
    373374then
    374375   CPP_KEY="$CPP_KEY INCA"
    375    INCLUDE="$INCLUDE -I${INCA_INCDIR}"
    376    LIB="$LIB -L${INCA_LIBDIR} -lchimie"
    377    libchimie=" -L${INCA_LIBDIR} -lchimie"
     376   INCLUDE="$INCLUDE ${INCA_INCDIR}"
     377   LIB="$LIB ${INCA_LIBDIR} ${INCA_LIB}"
     378   libchimie=" ${INCA_LIBDIR} ${INCA_LIB}"
    378379fi
    379380
    … …  
    381382then
    382383   CPP_KEY="$CPP_KEY CPP_COUPLE"
    383    INCLUDE="$INCLUDE -I${OASIS_INCDIR}"
    384    LIB="$LIB -L${OASIS_LIBDIR} -lpsmile.${couple} -lmpp_io"
     384   INCLUDE="$INCLUDE ${OASIS_INCDIR}"
     385   LIB="$LIB ${OASIS_LIBDIR} ${OASIS_LIB}"
    385386fi
    386387
    … …  
    442443
    443444#==============================================================================
    444 if [ "$veget" = "true" -o "$veget" = "orchidee1.9" -o "$veget" = "orchidee2.0" -o "$veget" = "orchidee2.1" ]
    445 then
    446 
    447    INCLUDE="${INCLUDE} -I${ORCH_INCDIR}"
     445if [ "$veget" = "true" -o "$veget" = "orchidee1.9" -o "$veget" = "orchidee2.0" -o "$veget" = "orchidee2.1" -o "$veget" = "orchideetrunk" ]
     446then
     447
     448   INCLUDE="${INCLUDE} ${ORCH_INCDIR}"
    448449   CPP_KEY="$CPP_KEY CPP_VEGET"
    449450# temporary, for Orchidee versions 1.9.* (before openmp activation)
    … …  
    452453   fi
    453454   if [[ "$veget" == "orchidee2.0" ]] ; then
    454       orch_libs="sechiba parameters stomate parallel orglob orchidee"
     455      orch_libs="-lsechiba -lparameters -lstomate -lparallel -lorglob -lorchidee"
    455456      CPP_KEY="$CPP_KEY ORCHIDEE_NOUNSTRUCT"
    456457   elif [[ "$veget" == "orchidee2.1" ]] ; then
    457       orch_libs="sechiba parameters stomate parallel orglob orchidee"
     458      CPP_KEY="$CPP_KEY ORCHIDEE_NOLIC"
     459      orch_libs="-lsechiba -lparameters -lstomate -lparallel -lorglob -lorchidee"
     460   elif [[ "$veget" == "orchideetrunk" ]] ; then
     461      orch_libs="-lorchidee"
    458462   else
    459       orch_libs="sechiba parameters stomate parallel orglob"
     463      orch_libs="-lsechiba -lparameters -lstomate -lparallel -lorglob"
    460464   fi
    461    LIB="${LIB} -L${ORCH_LIBDIR}"
    462    for lib in ${orch_libs} ; do
    463       if [ -f ${ORCH_LIBDIR}/lib${LIBPREFIX}$lib.a ] ; then
    464          LIB="${LIB} -l${LIBPREFIX}$lib "
    465       fi
    466    done
     465   LIB="${LIB} ${ORCH_LIBDIR} ${orch_libs}"
     466#   for lib in ${orch_libs} ; do
     467#      if [ -f ${ORCH_LIBDIR}/lib${LIBPREFIX}$lib.a ] ; then
     468#         LIB="${LIB} -l${LIBPREFIX}$lib "
     469#      fi
     470#   done
    467471elif [[ "$veget" != "false" ]] ; then
    468472   echo "Option -v $veget does not exist"
    … …  
    478482then
    479483   CPP_KEY="$CPP_KEY CPP_IOIPSL"
    480    INCLUDE="$INCLUDE -I${IOIPSL_INCDIR}"
    481    LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl"
     484   INCLUDE="$INCLUDE ${IOIPSL_INCDIR}"
     485   LIB="$LIB ${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl"
    482486elif [[ $io == mix ]]
    483487then
    484488   # For now, xios implies also using ioipsl
    485489   CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS"
    486    INCLUDE="$INCLUDE -I${IOIPSL_INCDIR} -I${XIOS_INCDIR}"
    487    LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios -l${LIBPREFIX}stdc++"
     490   INCLUDE="$INCLUDE ${IOIPSL_INCDIR} ${XIOS_INCDIR}"
     491   LIB="$LIB ${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl ${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios -l${LIBPREFIX}stdc++"
    488492elif [[ $io == xios ]]
    489493then
    490494   # For now, xios implies also using ioipsl
    491495   CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS CPP_IOIPSL_NO_OUTPUT"
    492    INCLUDE="$INCLUDE -I${IOIPSL_INCDIR} -I${XIOS_INCDIR}"
    493    LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios -l${LIBPREFIX}stdc++"
     496   INCLUDE="$INCLUDE ${IOIPSL_INCDIR} ${XIOS_INCDIR}"
     497   LIB="$LIB ${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl ${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios -l${LIBPREFIX}stdc++"
    494498fi
    495499
    … …  
    556560
    557561INCLUDE="$INCLUDE ${NETCDF_INCDIR}"
    558 LIB="$LIB ${NETCDF_LIBDIR}"
     562LIB="$LIB ${NETCDF_LIBDIR} ${NETCDF_LIB}"
    559563
    560564########################################################################
    … …  
    707711   # On enleve tout apres ONLy et on met un "uniq" pour que ca ne recrée pas
    708712   # le makefile si on se contente d'ajouter des lignes dans le ONLY
     713   exclude="replay automatic include"
    709714   for str in subroutine "use " "include " ; do
    710       grep -i "$str" libf/$dir/*.[Fh] | cut -d\( -f1 | sed -e 's/[Oo][Nn][Ll][Yy].*.$//' | uniq >> tmp77
    711       grep -i "$str" libf/$dir/*.F90  | cut -d\( -f1 | sed -e 's/[Oo][Nn][Ll][Yy].*.$//' | uniq >> tmp90
     715      grep -i "$str" libf/$dir/*.[Fh] | sed -e "/$exclude/d" | cut -d\( -f1 | sed -e 's/[Oo][Nn][Ll][Yy].*.$//' | uniq >> tmp77
     716      grep -i "$str" libf/$dir/*.F90  | sed -e "/$exclude/d" | cut -d\( -f1 | sed -e 's/[Oo][Nn][Ll][Yy].*.$//' | uniq >> tmp90
    712717   done
    713718done
Note: See TracChangeset for help on using the changeset viewer.