Changeset 1521 for trunk/LMDZ.MARS/create_make_gcm

Timestamp:

Mar 25, 2016, 10:34:35 AM (9 years ago)

Author:

emillour

Message:

All GCMs: Updates to make planetary codes (+Earth) setups converge.

• Made a "phy_common" directory in libf, to contain routines common (wrt structural nature of underlying code/grid) to all LMDZ-related physics packages.
• moved all "mod_phys_*" and "mod_grid_phy_lmdz" files from dynlonlat_phylonlat to "phy_common"
• moved "ioipsl_getincom_p.F90 from "misc" to "phy_common" and modified it to match Earth GCM version and renamed it ioipsl_getin_p_mod.F90
• added an "abort_physics" (as in Earth GCM) in "phy_common"
• added a "print_control_mod.F90 (as in Earth GCM) in phy_common
• made similar changes in LMDZ.GENERIC and LMDZ.MARS

EM

File:

• trunk/LMDZ.MARS/create_make_gcm (modified) (3 diffs)

trunk/LMDZ.MARS/create_make_gcm

@@ -74 +74 @@
 echo 'L_FILTRE   = -l$(FILTRE)'
 echo 'L_DYN_PHY = -ldynlmdz_phy$(PHYS) '
-echo 'L_PHY = -lphy$(PHYS) '
+echo 'L_PHY = -lphy$(PHYS) -lphy_common'
 echo 'L_MISC    = -lmisc'
 echo 'L_AERONOMARS    = -laeronomars'
@@ -100 +100 @@
 echo 'DYN  = dyn$(DIM)d'
 echo
-echo 'main : $(DYN) misc phys dyn_phy aeronomars $(OPTION_DEP) '
+echo 'main : $(DYN) misc phys phy_common dyn_phy aeronomars $(OPTION_DEP) '
 echo '  cd $(LIBO) ; $(RANLIB) lib*.a ; cd $(GCM) ;\'
 echo '  cd $(LOCAL_DIR); \'
 echo '  $(COMPILE90) $(LIBF)/$(DIRMAIN)/$(SOURCE) -o $(PROG).o ; \'
-if [ "$CRAY" = '0' ] ; then
-echo '  $(LINK) $(PROG).o -L$(LIBO) $(L_DYN) $(L_DYN_PHY) $(L_ADJNT) $(L_FILTRE) $(L_AERONOMARS) $(L_PHY) $(L_DYN_PHY) $(L_MISC) $(L_DYN) $(L_AERONOMARS) $(OPLINK) $(OPTION_LINK) -o $(LOCAL_DIR)/$(PROG).e ; $(RM) $(PROG).o '
-else
-echo '  $(LINK) $(PROG).o -L$(LIBO) $(L_DYN) $(L_DYN_PHY) $(L_ADJNT) $(L_FILTRE) $(L_AERONOMARS) $(L_PHY) $(L_DYN_PHY) $(L_MISC) $(L_DYN) $(L_AERONOMARS) $(OPLINK) $(OPTION_LINK) -o $(LOCAL_DIR)/$(PROG).e ; $(RM) $(PROG).o '
-fi
+echo '  $(LINK) $(PROG).o -L$(LIBO) $(L_DYN) $(L_DYN_PHY) $(L_ADJNT) $(L_FILTRE) $(L_AERONOMARS) $(L_PHY) $(L_DYN_PHY) $(L_MISC) $(L_DYN) $(L_AERONOMARS) $(L_PHY) $(OPLINK) $(OPTION_LINK) -o $(LOCAL_DIR)/$(PROG).e ; $(RM) $(PROG).o '
 echo
 echo 'dyn : $(LIBO)/libdyn$(DIM)d.a $(FILTRE)$(DIM)d'
@@ -115 +111 @@
 echo
 echo 'phys : $(LIBPHY)'
+echo 'phy_common : $(LIBPHY_COMMON)'
 echo
 echo 'dyn3d : $(LIBO)/libdyn3d.a $(LIBO)/lib$(FILTRE).a'