Changeset 1540 for trunk/LMDZ.MARS/makegcm_pgf

Timestamp:

Apr 13, 2016, 9:57:46 AM (9 years ago)

Author:

emillour

Message:

All GCMS: Further adaptations to keep up with changes in LMDZ5 concerning
physics/dynamics separation:

• changed directory "dynlonlat_phylonlat" to "dynphy_lonlat" and adapted makelmdz and makelmdz_fcm scripts accordingly.
• added option "-libphy" to makelmdz_fcm to just build a physics library, without any main program (not operational yet; further cleanup in the physics required).
• moved "iniprint.h" from dyn3d_common to misc (NB: it is used in both physics and dynamics; this should be cleaned up further...)

EM

File:

• trunk/LMDZ.MARS/makegcm_pgf (modified) (4 diffs)

trunk/LMDZ.MARS/makegcm_pgf

@@ -8 +8 @@
 set physique=mars
 set phys="PHYS=$physique"
-set include='-I$(LIBF)/grid -I$(LIBF)/misc -I. -I$(LIBF)/dynlonlat_phylonlat'
+set include='-I$(LIBF)/grid -I$(LIBF)/misc -I. -I$(LIBF)/dynphy_lonlat'
 set cpp_def=''
 set ntrac = 1
@@ -507 +507 @@
   if ( "$dyntype" == "olddyn" ) then
     set include="$include "'-I$(LIBF)/olddyn3d '
-    set src_dirs="$src_dirs olddyn3d dynlonlat_phylonlat dynlonlat_phylonlat/phy$physique"
+    set src_dirs="$src_dirs olddyn3d dynphy_lonlat dynphy_lonlat/phy$physique"
   else
     set include="$include "'-I$(LIBF)/dyn3d '
-    set src_dirs="$src_dirs dyn3d dynlonlat_phylonlat dynlonlat_phylonlat/phy$physique"
+    set src_dirs="$src_dirs dyn3d dynphy_lonlat dynphy_lonlat/phy$physique"
   endif
-  set libdyn_phy="-ldynlonlat_phylonlat"
-  set LIBDYN_PHYS='$(LIBO)/libdynlonlat_phylonlat.a'
+  set libdyn_phy="-ldynphy_lonlat"
+  set LIBDYN_PHYS='$(LIBO)/libdynphy_lonlat.a'
   set dimh=`echo $dim | awk ' { print $1 "." $2 } '`
 endif
@@ -764 +764 @@
 cd $localdir
 
-## locate main program (could be in dyn3d or dynlonlat_phylonlat/phy$physique
+## locate main program (could be in dyn3d or dynphy_lonlat/phy$physique
 ##  or phy$physique/dyn1d   and could be .F or .F90)
 set source_code=${code}.F
@@ -779 +779 @@
   set source_code=${code}.F90
 endif
-if ( -f $LMDGCM/libf/dynlonlat_phylonlat/phy${physique}/${code}.F ) then
-  set dirmain=dynlonlat_phylonlat/phy${physique}
+if ( -f $LMDGCM/libf/dynphy_lonlat/phy${physique}/${code}.F ) then
+  set dirmain=dynphy_lonlat/phy${physique}
   set source_code=${code}.F
 endif
-if ( -f $LMDGCM/libf/dynlonlat_phylonlat/phy${physique}/${code}.F90 ) then
-  set dirmain=dynlonlat_phylonlat/phy${physique}
+if ( -f $LMDGCM/libf/dynphy_lonlat/phy${physique}/${code}.F90 ) then
+  set dirmain=dynphy_lonlat/phy${physique}
   set source_code=${code}.F90
 endif