Changeset 882 for LMDZ4/trunk

Timestamp:

Jan 31, 2008, 5:48:13 PM (17 years ago)

Author:

Laurent Fairhead

Message:

Modifs pour intégrer le 1D FH
LF

Location:

LMDZ4/trunk

Files:

• libf/phylmd/ocean_forced_mod.F90 (modified) (3 diffs)
• libf/phylmd/pbl_surface_mod.F90 (modified) (2 diffs)
• makegcm (modified) (5 diffs)

LMDZ4/trunk/libf/phylmd/ocean_forced_mod.F90

@@ -43 +43 @@
 
   END SUBROUTINE ocean_forced_init
+!
+!****************************************************************************************
+!****************************************************************************************
+! 
+  SUBROUTINE ocean_forced_final
+! Allocate fields needed for this module
+!    
+    INTEGER              :: error
+    CHARACTER (len = 80) :: abort_message
+    CHARACTER (len = 20) :: modname = 'ocean_forced_init'
+!****************************************************************************************
+
+    DEALLOCATE(tmp_flux_o)
+    DEALLOCATE(tmp_flux_g)
+
+
+  END SUBROUTINE ocean_forced_final
 !
 !****************************************************************************************
@@ -269 +286 @@
     IF (soil_model) THEN 
 ! update tsoil and calculate soilcap and soilflux
+
        CALL soil(dtime, is_sic, knon,snow, tsurf_tmp, tsoil,soilcap, soilflux)
        cal(1:knon) = RCPD / soilcap(1:knon)
@@ -338 +356 @@
     pctsrf_sic(:) = pctsrf_lim(:,is_sic)
 
+
   END SUBROUTINE ocean_forced_ice
 !

LMDZ4/trunk/libf/phylmd/pbl_surface_mod.F90

@@ -462 +462 @@
     
 !****************************************************************************************
+! Declarations specifiques pour le 1D. A reprendre 
+  REAL  :: fsens,flat
+  LOGICAL ok_flux_surf
+  data ok_flux_surf/.false./
+    common /flux_arp/fsens,flat,ok_flux_surf
+
+!****************************************************************************************
 ! End of declarations
 !****************************************************************************************
@@ -824 +831 @@
 !****************************************************************************************
 ! H and Q
-       y_flux_t1(:) =  yfluxsens(:)
-       y_flux_q1(:) = -yevap(:)
+       print *,'pbl_surface: ok_flux_surf=',ok_flux_surf
+       print *,'pbl_surface: fsens flat RLVTT=',fsens,flat,RLVTT
+       if (ok_flux_surf) then
+          y_flux_t1(:) =  fsens
+          y_flux_q1(:) =  flat/RLVTT
+          yfluxlat(:) =  flat
+       else
+          y_flux_t1(:) =  yfluxsens(:)
+          y_flux_q1(:) = -yevap(:)
+       endif
 
        CALL climb_hq_up(knon, dtime, yt, yq, &

LMDZ4/trunk/makegcm

@@ -27 +27 @@
 set io=ioipsl
 
-set FC_LINUX=pgf90
+set FC_LINUX=g95
 
 ########################################################################
@@ -39 +39 @@
 #set LMDGCM="`pwd`"
 #setenv LIBOGCM $LMDGCM/libo
+#set LMDGCM=/d4/fairhead/V4/
+#setenv LIBOGCM $LMDGCM/libo
+#
 #
 #setenv IOIPSLDIR /u/fairhead/modipsl_ioipsl_3/lib_i4r4_32bits
@@ -44 +47 @@
 #setenv NCDFINC /distrib/local/netcdf/pgi_32bits/include
 #setenv NCDFLIB /distrib/local/netcdf/pgi_32bits/lib/
+#setenv IOIPSLDIR /d4/fairhead/Install_LMDZ4_FH/LMDZ4preV4/modipsl/lib/
+#setenv MODIPSLDIR /d4/fairhead/Install_LMDZ4_FH/LMDZ4preV4/modipsl/lib/
+#setenv NCDFINC /d4/fairhead/Install_LMDZ4_FH/LMDZ4preV4/netcdf-3.6.1/include
+#setenv NCDFLIB /d4/fairhead/Install_LMDZ4_FH/LMDZ4preV4/netcdf-3.6.1/lib
 
 
@@ -247 +254 @@
 #     set optimtru90=" -c -Mfree "
    else if ( $FC_LINUX == 'g95' ) then 
-     set optim=" $OPT_LINUX -fno-second-underscore -ffixed-form -fstatic "
-     set optim90=" $OPT_LINUX -fno-second-underscore -ffixed-form -fstatic "
-     set optimtru90=" $OPT_LINUX -fno-second-underscore -ffree-form -fstatic "
+     set optim=" $OPT_LINUX "
+     set optim90=" $OPT_LINUX "
+     set optimtru90=" $OPT_LINUX "
    else
      echo 'compilateur linux non reconnu'
@@ -637 +644 @@
    set dim_=`echo $dim | sed -e 's/[^0-9]/_/g'`
 else
-   set dim=`echo $dim | sed -n -e 's/[^0-9]/ /gp'`
-   set dim_=`echo $dim | sed -n -e 's/[^0-9]/_/gp'`
+   set dim_=`echo $dim | sed -e 's/[^0-9]/_/g'`
+   set dim=`echo $dim | sed -e 's/[^0-9]/ /g'`
 endif
 set nomlib=${nomlib}${physique}_${dim_}_t${ntrac}_$grille