Changeset 979 for trunk/LMDZ.COMMON/makelmdz

Timestamp:

Jun 5, 2013, 2:41:09 PM (12 years ago)

Author:

emillour

Message:

Common dynamics:
Updates in the dynamics (seq and ) to keep up with updates
in LMDZ5 (up to LMDZ5 trunk, rev 1760):

• General stuff (essentially to keep up with Earth model):
• Updated makelmdz_fcm and makelmdz (more control on dimension.h, added option -mem, although it is not usefull for now)
• Updated build_gcm with more control over fcm
• Updated create_make_gcm (enable looking for code in subdirectories)

• bibio:
• updates (just renaming the files actually...) new_unit.F90 => new_unit_m.F90, pchsp_95.F90 => pchsp_95_m.F90 and pchfe_95.F90 => pchfe_95_m.F90

• filtrez:
• mod_fft.F90: use more baseline CPP directives for preprocessor compatibility
• mod_filtre_fft_loc.F90: added this new file
• filtreg_mod.f90: added calls to init_..._loc
• filtreg.F: fixed calls to DGEMM into SGEMM (preprocessing does the switch)

• dyn3d:
• removed obsolete files: etat0_netcdf.F90 limit_netcdf.F90

pres2lev.F90

• added new file : pres2lev_mod.F90 (module containing "old" pres2lev)
• gcm.F: changed args to call to inidissip (added arg "vert_prof_dissip")
• inidissip.F90: added arg "vert_prof_dissip" and the "earth model" discterizations (flagged with "planet_type=="earth")
• comdissnew.h: added 'vert_prof_dissip' to the common block
• guide_mod.F90: added the "use pres2lev_mod"
• conf_gcm.F: cosmetics, and evaluation of vert_prof_dissip, (and also of dissip_* factors, for Earth model)
• comconst.h : added dissip_factz,dissip_zref variables (for Earth mode dissip)

• dyn3dpar:
• removed obsolete files: etat0_netcdf.F90 limit_netcdf.F90

pres2lev.F90 mod_const_para.F90

• added new files: pres2lev_mod.F90 (module containing "old" pres2lev)

mod_const_mpi

• abort_gcm : better control of abort in parallel mode
• gcm.F: changed args to call to inidissip (added arg "vert_prof_dissip")
• inidissip.F90: added arg "vert_prof_dissip" and the "earth model" discterizations (flagged with "planet_type=="earth")
• comdissnew.h: added 'vert_prof_dissip' to the common block
• filtreg_p.F : bug correction (array bounds)
• guide_p_mod.F90 : added the "use pres2lev_mod"
• conf_gcm.F : cosmetics (and evaluation of vert_prof_dissip , and

also of dissip_* factors, for Earth model)
plus check if "adjust" is indeed not used in OpenMP

• comconst.h : add dissip_factz,dissip_zref variables (for Earth mode dissip)

EM

File:

• trunk/LMDZ.COMMON/makelmdz (modified) (11 diffs)

trunk/LMDZ.COMMON/makelmdz

@@ -19 +19 @@
 chimie=false
 parallel=none
+paramem="par"
 compil_mod=prod
 io=ioipsl
@@ -29 +30 @@
 
 # guess a default 'arch'
-arch="g95" # start with assuming we're on a Linux/Unix machine with g95
+arch="local" # start with assuming we're on a local machine with local arch file
 ## try to recognise machine and infer arch from it
 machine=`hostname`
@@ -126 +127 @@
 [-cpp CPP_KEY]             : additional preprocessing definitions
 [-adjnt]                   : adjoint model, not operational ...
+[-mem]                     : reduced memory dynamics (if in parallel mode)
 [-filtre NOMFILTRE]        : use filtre from libf/NOMFILTRE (default: filtrez)
 [-link LINKS]              : additional links with other libraries
@@ -138 +140 @@
       
       "-p")
-          physique="$2" ;  shift ; shift ;;
+          physique="$2" ; shift ; shift ;;
 
       "-s")
@@ -186 +188 @@
       "-cosp")
           cosp="$2" ; shift ; shift ;;
+      
+      "-mem")
+          paramem="mem" ; shift ;;
 
       "-filtre")
@@ -424 +429 @@
 ########################################################################
 
+cd $LIBFGCM/grid
+if [[ -f dimensions.h ]]
+then
+  echo 'ATTENTION: vous etes sans doute en train de compiler le modele par ailleurs'
+  echo "Attendez que la premiere compilation soit terminee pour relancer la suivante."
+  echo "Si vous etes sur que vous ne compilez pas le modele par ailleurs,"
+  echo  vous pouvez continuer en repondant oui.
+  echo "Voulez-vous vraiment continuer?"
+  echo ""
+  echo "WARNING: you are probably already compiling the model somewhere else."
+  echo "Wait until the first compilation is finished before launching this one."
+  echo "If you are sure that you are not compiling elsewhere, just answer "
+  echo "yes (or 'oui') to the question below to proceed."
+  echo "Do you wish to continue?"
+  read reponse
+  if [[ $reponse == "oui" || $reponse == "yes" ]]
+  then
+    \rm -f $LIBFGCM/grid/dimensions.h
+  else
+    exit
+  fi
+fi
+
+
 cd $LIBFGCM/grid/dimension
 ./makdim $dim
@@ -496 +525 @@
 then
   SUFF_NAME=${SUFF_NAME}_para
+  DYN=dyn${dimc}d${paramem}
+  if [[ "$paramem" == "mem" ]]
+  then
+   SUFF_NAME=${SUFF_NAME}_${paramem}
+  fi
 else
   SUFF_NAME=${SUFF_NAME}_seq
+  DYN=dyn${dimc}d
 fi
 
@@ -634 +669 @@
 then
   INCLUDE="$INCLUDE"' -I$(LIBF)/phy'"$physique"
+  phys="PHYS=$physique"
+else
+  # trick to avoid having a physics-related library in the makefile
+  phys="L_PHY= LIBPHY="
 fi
 if (( $dimension == 1 ))
@@ -674 +713 @@
 $dyn \
 LIBO=${LIBOGCM}/${nomlib} \
-PHYS=$physique \
+$phys \
 DIM=$dimc \
 FLAG_PARA=$FLAG_PARA \
@@ -705 +744 @@
 $dyn \
 LIBO=${LIBOGCM}/${nomlib} \
-PHYS=$physique \
+$phys \
 DIM=$dimc \
 FLAG_PARA=$FLAG_PARA \
@@ -725 +764 @@
 PROG=$code
 
-if [[ -r $libf/grid/dimensions.h ]]
+if [[ -r $LIBFGCM/grid/dimensions.h ]]
 then
   # Cleanup: remove dimension.h file
-  \rm -f $libf/grid/dimensions.h
-fi
+  \rm -f $LIBFGCM/grid/dimensions.h
+fi