Changeset 1944 for LMDZ5/trunk/libf

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/libf

Files:

• dyn3d_common (added)
• dyn3d_common/defrun.F (moved) (moved from LMDZ5/trunk/libf/dyn3d/defrun.F)
• dyn3d_common/fyhyp.F (moved) (moved from LMDZ5/trunk/libf/dyn3d/fyhyp.F)
• dyn3d_common/grid_atob.F (moved) (moved from LMDZ5/trunk/libf/dyn3d/grid_atob.F)
• dyn3d_common/grid_noro.F (moved) (moved from LMDZ5/trunk/libf/dyn3d/grid_noro.F) (4 diffs)
• dyn3d_common/juldate.F (moved) (moved from LMDZ5/trunk/libf/dyn3d/juldate.F)
• dyn3d_common/pres2lev_mod.F90 (moved) (moved from LMDZ5/trunk/libf/dyn3d/pres2lev_mod.F90)
• dyn3d_common/ran1.F (moved) (moved from LMDZ5/trunk/libf/dyn3d/ran1.F)
• dyn3dmem/defrun.F (deleted)
• dyn3dmem/fyhyp.F (deleted)
• dyn3dmem/grid_atob.F (deleted)
• dyn3dmem/grid_noro.F (deleted)
• dyn3dmem/juldate.F (deleted)
• dyn3dmem/pres2lev_mod.F90 (deleted)
• dyn3dmem/ran1.F (deleted)
• dyn3dpar/defrun.F (deleted)
• dyn3dpar/fyhyp.F (deleted)
• dyn3dpar/grid_atob.F (deleted)
• dyn3dpar/grid_noro.F (deleted)
• dyn3dpar/juldate.F (deleted)
• dyn3dpar/pres2lev_mod.F90 (deleted)
• dyn3dpar/ran1.F (deleted)

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)