Changeset 1944

Timestamp:

Jan 22, 2014, 6:39:15 PM (11 years ago)

Author:

lguez

Message:

Created directory dyn3d_common. Began moving to dyn3d_common files
that were duplicated in dyn3d, dyn3dpar and dyn3dmem. Adapted
compilation files for makegcm, makelmdz and makelmdz_fcm. Adapted
install_1d_src.sh.

Location:

LMDZ5/trunk

Files:

• bld.cfg (modified) (1 diff)
• create_make_gcm (modified) (5 diffs)
• libf/dyn3d_common (added)
• libf/dyn3d_common/defrun.F (moved) (moved from LMDZ5/trunk/libf/dyn3d/defrun.F)
• libf/dyn3d_common/fyhyp.F (moved) (moved from LMDZ5/trunk/libf/dyn3d/fyhyp.F)
• libf/dyn3d_common/grid_atob.F (moved) (moved from LMDZ5/trunk/libf/dyn3d/grid_atob.F)
• libf/dyn3d_common/grid_noro.F (moved) (moved from LMDZ5/trunk/libf/dyn3d/grid_noro.F) (4 diffs)
• libf/dyn3d_common/juldate.F (moved) (moved from LMDZ5/trunk/libf/dyn3d/juldate.F)
• libf/dyn3d_common/pres2lev_mod.F90 (moved) (moved from LMDZ5/trunk/libf/dyn3d/pres2lev_mod.F90)
• libf/dyn3d_common/ran1.F (moved) (moved from LMDZ5/trunk/libf/dyn3d/ran1.F)
• libf/dyn3dmem/defrun.F (deleted)
• libf/dyn3dmem/fyhyp.F (deleted)
• libf/dyn3dmem/grid_atob.F (deleted)
• libf/dyn3dmem/grid_noro.F (deleted)
• libf/dyn3dmem/juldate.F (deleted)
• libf/dyn3dmem/pres2lev_mod.F90 (deleted)
• libf/dyn3dmem/ran1.F (deleted)
• libf/dyn3dpar/defrun.F (deleted)
• libf/dyn3dpar/fyhyp.F (deleted)
• libf/dyn3dpar/grid_atob.F (deleted)
• libf/dyn3dpar/grid_noro.F (deleted)
• libf/dyn3dpar/juldate.F (deleted)
• libf/dyn3dpar/pres2lev_mod.F90 (deleted)
• libf/dyn3dpar/ran1.F (deleted)
• makegcm (modified) (1 diff)
• makelmdz (modified) (1 diff)
• tools/install_1d_src.sh (modified) (1 diff)

LMDZ5/trunk/bld.cfg

@@ -28 +28 @@
 src::filtrez %SRC_PATH/filtrez
 src::bibio   %SRC_PATH/bibio
+src::dyn3d_common   %SRC_PATH/dyn3d_common
 src::cosp    %COSP
 src::ext_src %EXT_SRC

LMDZ5/trunk/create_make_gcm

@@ -48 +48 @@
 echo "LOCAL_DIR=`echo $localdir`"
 echo 'BIBIO    = $(LIBF)/bibio'
+echo 'DYN3D_COMMON   = $(LIBF)/dyn3d_common'
 echo "FILTRE   = filtre"
 echo "PHYS  = "
@@ -67 +68 @@
 echo 'L_PHY = -lphy$(PHYS) '
 echo 'L_BIBIO    = -lbibio'
+echo 'L_DYN3D_COMMON    = -ldyn3d_common'
 echo 'L_ADJNT    ='
 echo 'L_COSP     = -lcosp'
@@ -92 +94 @@
 echo
 #echo 'main : chimie $(DYN) bibio phys $(OPTION_DEP) '
-echo 'main : $(DYN) bibio phys $(OPTION_DEP) '
+echo 'main : $(DYN) bibio dyn3d_common phys $(OPTION_DEP) '
 echo '  cd $(LIBO) ; $(RANLIB) lib*.a ; cd $(GCM) ;\'
 echo '  cd $(LOCAL_DIR); \'
 echo '  $(COMPILE90) $(LIBF)/$(DIRMAIN)/$(SOURCE) -o $(PROG).o ; \'
-echo '  $(LINK) $(PROG).o -L$(LIBO) $(L_DYN) $(L_ADJNT) $(L_COSP) $(L_PHY) $(L_DYN) $(L_BIBIO) $(L_DYN) $(L_FILTRE) $(OPLINK) $(OPTION_LINK) -o $(LOCAL_DIR)/$(PROG).e ; $(RM) $(PROG).o '
+echo '  $(LINK) $(PROG).o -L$(LIBO) $(L_DYN) $(L_ADJNT) $(L_COSP) $(L_PHY) $(L_DYN) $(L_BIBIO) $(L_DYN3D_COMMON) $(L_DYN) $(L_FILTRE) $(OPLINK) $(OPTION_LINK) -o $(LOCAL_DIR)/$(PROG).e ; $(RM) $(PROG).o '
 echo
 echo 'dyn : $(LIBO)/libdyn$(DIM)d$(FLAG_PARA).a $(FILTRE)$(DIM)d'
@@ -105 +107 @@
 echo
 echo 'bibio : $(LIBO)/libbibio.a'
+echo
+echo 'dyn3d_common : $(LIBO)/libdyn3d_common.a'
 echo
 echo 'adjnt : $(LIBO)/libadjnt.a'
@@ -177 +181 @@
             strj=`echo $stri | tr [A-Z] [a-z]`
             str2=""
-            for dirinc in filtrez bibio grid dyn3d phydev $diri $diri/*/ ; do
+            for dirinc in filtrez bibio dyn3d_common grid dyn3d phydev $diri $diri/*/ ; do
 # Recherche dans l'ordre hierarchique inverse car seule la derniere
 # ligne est conservee

LMDZ5/trunk/libf/dyn3d_common/grid_noro.F

@@ -83 +83 @@
       REAL zsig(imar+1,jmar),zgam(imar+1,jmar),zthe(imar+1,jmar)
       REAL zpic(imar+1,jmar),zval(imar+1,jmar)
-cx$$ PB     integer mask(imar+1,jmar)
+cxxx PB     integer mask(imar+1,jmar)
       real mask(imar+1,jmar), mask_tmp(imar+1,jmar)
       real num_tot(2200,1100),num_lan(2200,1100)
@@ -274 +274 @@
          IF (weight(ii,jj) .NE. 0.0) THEN
 c  Mask
-cx$$           if(num_lan(ii,jj)/num_tot(ii,jj).ge.0.5)then
-cx$$             mask(ii,jj)=1
-cx$$           else
-cx$$             mask(ii,jj)=0
-cx$$           ENDIF
+cXXX           if(num_lan(ii,jj)/num_tot(ii,jj).ge.0.5)then
+cXXX             mask(ii,jj)=1
+cXXX           else
+cXXX             mask(ii,jj)=0
+cXXX           ENDIF
              if (.not. masque_lu) then
                mask(ii,jj) = num_lan(ii,jj)/num_tot(ii,jj)
@@ -319 +319 @@
        CALL MVA9(zxtzy,iim+1,jjm+1) 
        CALL MVA9(zytzy,iim+1,jjm+1)
-Cx$$   Masque prenant en compte maximum de terre
-Cx$$  On seuil a 10% de terre de terre car en dessous les parametres de surface n'on
-Cx$$ pas de sens (PB)
+CXXX   Masque prenant en compte maximum de terre
+CXXX  On seuil a 10% de terre de terre car en dessous les parametres de surface n'on
+CXXX pas de sens (PB)
        mask_tmp= 0.0
        WHERE(mask .GE. 0.1) mask_tmp = 1.
@@ -339 +339 @@
            if(abs(xm).le.xw) xm=xw*sign(1.,xm)
 c slope: 
-cx$$           zsig(ii,jj)=sqrt(xq)*mask(ii,jj)
-cx$$c isotropy:
-cx$$           zgam(ii,jj)=xp/xq*mask(ii,jj)
-cx$$c angle theta:
-cx$$           zthe(ii,jj)=57.29577951*atan2(xm,xl)/2.*mask(ii,jj)
-cx$$           zphi(ii,jj)=zmea(ii,jj)*mask(ii,jj)
-cx$$           zmea(ii,jj)=zmea(ii,jj)*mask(ii,jj)
-cx$$           zpic(ii,jj)=zpic(ii,jj)*mask(ii,jj)
-cx$$           zval(ii,jj)=zval(ii,jj)*mask(ii,jj)
-cx$$           zstd(ii,jj)=zstd(ii,jj)*mask(ii,jj)
-Cx$* PB modif pour maque de terre fractionnaire
+cXXX           zsig(ii,jj)=sqrt(xq)*mask(ii,jj)
+cXXXc isotropy:
+cXXX           zgam(ii,jj)=xp/xq*mask(ii,jj)
+cXXXc angle theta:
+cXXX           zthe(ii,jj)=57.29577951*atan2(xm,xl)/2.*mask(ii,jj)
+cXXX           zphi(ii,jj)=zmea(ii,jj)*mask(ii,jj)
+cXXX           zmea(ii,jj)=zmea(ii,jj)*mask(ii,jj)
+cXXX           zpic(ii,jj)=zpic(ii,jj)*mask(ii,jj)
+cXXX           zval(ii,jj)=zval(ii,jj)*mask(ii,jj)
+cXXX           zstd(ii,jj)=zstd(ii,jj)*mask(ii,jj)
+CXX* PB modif pour maque de terre fractionnaire
 c slope: 
            zsig(ii,jj)=sqrt(xq)*mask_tmp(ii,jj)

LMDZ5/trunk/makegcm

@@ -10 +10 @@
 set physique=lmd
 set phys="PHYS=$physique"
-set include='-I$(LIBF)/grid -I$(LIBF)/bibio -I$(LIBF)/filtrez -I. '
+set include='-I$(LIBF)/grid -I$(LIBF)/bibio -I$(LIBF)/dyn3d_common -I$(LIBF)/filtrez -I. '
 set filtre=filtrez
 set grille=reg

LMDZ5/trunk/makelmdz

@@ -83 +83 @@
 
 CPP_KEY="" 
-INCLUDE='-I$(LIBF)/grid -I$(LIBF)/bibio -I$(LIBF)/filtrez -I. '
+INCLUDE='-I$(LIBF)/grid -I$(LIBF)/bibio -I$(LIBF)/dyn3d_common -I$(LIBF)/filtrez -I. '
 LIB=""
 adjnt=""

LMDZ5/trunk/tools/install_1d_src.sh

@@ -42 +42 @@
  ln -s ../dyn3d/infotrac.F90 .
  ln -s ../dyn3d/conf_gcm.F .
- ln -s ../dyn3d/pres2lev* .
+ ln -s ../dyn3d_common/pres2lev* .
  ln -s ../dyn3d/control_mod.F90 .
  ln -s ../dyn3d/q_sat.F .